#include "hash.h"
#include "ircd.h"
#include "ircd_alloc.h"
-#include "ircd_auth.h"
#include "ircd_chattr.h"
#include "ircd_log.h"
#include "ircd_reply.h"
#include "opercmds.h"
#include "parse.h"
#include "res.h"
+#include "s_auth.h"
#include "s_bsd.h"
#include "s_conf.h"
#include "s_debug.h"
int tping, tconn, maxlinks, sendq, port, invert, stringno, flags;
char *name, *pass, *host, *ip, *username, *origin, *hub_limit;
char *stringlist[MAX_STRINGS];
+ struct ListenerFlags listen_flags;
struct ConnectionClass *c_class;
struct DenyConf *dconf;
struct ServerConf *sconf;
%token TIMEOUT
%token FAST
%token AUTOCONNECT
+%token PROGRAM
/* and now a lot of privileges... */
%token TPRIV_CHAN_LIMIT TPRIV_MODE_LCHAN TPRIV_DEOP_LCHAN TPRIV_WALK_LCHAN
%token TPRIV_LOCAL_KILL TPRIV_REHASH TPRIV_RESTART TPRIV_DIE
%token TPRIV_SEE_CHAN TPRIV_SHOW_INVIS TPRIV_SHOW_ALL_INVIS TPRIV_PROPAGATE
%token TPRIV_UNLIMIT_QUERY TPRIV_DISPLAY TPRIV_SEE_OPERS TPRIV_WIDE_GLINE
%token TPRIV_FORCE_OPMODE TPRIV_FORCE_LOCAL_OPMODE TPRIV_APASS_OPMODE
+%token TPRIV_LIST_CHAN
/* and some types... */
%type <num> sizespec
%type <num> timespec timefactor factoredtimes factoredtime
generalvhost: VHOST '=' QSTRING ';'
{
struct irc_in_addr addr;
- if (!strcmp($3, "*")) {
+ char *vhost = $3;
+
+ if (!strcmp(vhost, "*")) {
/* This traditionally meant bind to all interfaces and connect
* from the default. */
- } else if (!ircd_aton(&addr, $3))
- parse_error("Invalid virtual host '%s'.", $3);
+ } else if (!ircd_aton(&addr, vhost))
+ parse_error("Invalid virtual host '%s'.", vhost);
else if (irc_in_addr_is_ipv4(&addr))
memcpy(&VirtualHost_v4.addr, &addr, sizeof(addr));
else
memcpy(&VirtualHost_v6.addr, &addr, sizeof(addr));
- MyFree($3);
+ MyFree(vhost);
};
-adminblock: ADMIN '{' adminitems '}' ';'
+adminblock: ADMIN
+{
+ MyFree(localConf.location1);
+ MyFree(localConf.location2);
+ MyFree(localConf.contact);
+ localConf.location1 = localConf.location2 = localConf.contact = NULL;
+}
+'{' adminitems '}' ';'
{
if (localConf.location1 == NULL)
DupString(localConf.location1, "");
parse_error("Missing name in connect block");
else if (pass == NULL)
parse_error("Missing password in connect block");
+ else if (strlen(pass) > PASSWDLEN)
+ parse_error("Password too long in connect block");
else if (host == NULL)
parse_error("Missing host in connect block");
else if (strchr(host, '*') || strchr(host, '?'))
parse_error("Missing name in operator block");
else if (pass == NULL)
parse_error("Missing password in operator block");
+ /* Do not check password length because it may be crypted. */
else if (host == NULL)
parse_error("Missing host in operator block");
else if (c_class == NULL)
parse_error("Invalid or missing class in operator block");
+ else if (!FlagHas(&privs_dirty, PRIV_PROPAGATE)
+ && !FlagHas(&c_class->privs_dirty, PRIV_PROPAGATE))
+ parse_error("Operator block for %s and class %s have no LOCAL setting", name, c_class->cc_name);
else {
aconf = make_conf(CONF_OPERATOR);
aconf->name = name;
aconf->conn_class = c_class;
memcpy(&aconf->privs, &privs, sizeof(aconf->privs));
memcpy(&aconf->privs_dirty, &privs_dirty, sizeof(aconf->privs_dirty));
- if (!FlagHas(&privs_dirty, PRIV_PROPAGATE)
- && !FlagHas(&c_class->privs_dirty, PRIV_PROPAGATE))
- parse_error("Operator block for %s and class %s have no LOCAL setting", name, c_class->cc_name);
}
if (!aconf) {
MyFree(name);
TPRIV_DISPLAY { $$ = PRIV_DISPLAY; } |
TPRIV_SEE_OPERS { $$ = PRIV_SEE_OPERS; } |
TPRIV_WIDE_GLINE { $$ = PRIV_WIDE_GLINE; } |
+ TPRIV_LIST_CHAN { $$ = PRIV_LIST_CHAN; } |
LOCAL { $$ = PRIV_PROPAGATE; invert = 1; } |
TPRIV_FORCE_OPMODE { $$ = PRIV_FORCE_OPMODE; } |
TPRIV_FORCE_LOCAL_OPMODE { $$ = PRIV_FORCE_LOCAL_OPMODE; } |
portblock: PORT '{' portitems '}' ';'
{
if (port > 0 && port <= 0xFFFF)
- add_listener(port, host, pass, tconn, tping);
+ add_listener(port, host, pass, &listen_flags);
else
parse_error("Port %d is out of range", port);
MyFree(host);
MyFree(pass);
+ memset(&listen_flags, 0, sizeof(listen_flags));
host = pass = NULL;
- port = tconn = tping = 0;
+ port = 0;
};
portitems: portitem portitems | portitem;
portitem: portnumber | portvhost | portmask | portserver | porthidden;
portserver: SERVER '=' YES ';'
{
- tconn = -1;
+ FlagSet(&listen_flags, LISTEN_SERVER);
} | SERVER '=' NO ';'
{
- tconn = 0;
+ FlagClr(&listen_flags, LISTEN_SERVER);
};
porthidden: HIDDEN '=' YES ';'
{
- tping = -1;
+ FlagSet(&listen_flags, LISTEN_HIDDEN);
} | HIDDEN '=' NO ';'
{
- tping = 0;
+ FlagClr(&listen_flags, LISTEN_HIDDEN);
};
clientblock: CLIENT
{
maxlinks = 65535;
+ port = 0;
}
'{' clientitems '}' ';'
{
if (!c_class)
parse_error("Invalid or missing class in Client block");
+ else if (pass && strlen(pass) > PASSWDLEN)
+ parse_error("Password too long in connect block");
else if (ip && !ipmask_parse(ip, &addr, &addrbits))
parse_error("Invalid IP address %s in Client block", ip);
else {
memcpy(&aconf->address.addr, &addr, sizeof(aconf->address.addr));
else
memset(&aconf->address.addr, 0, sizeof(aconf->address.addr));
+ aconf->address.port = port;
aconf->addrbits = addrbits;
aconf->name = ip;
aconf->conn_class = c_class;
c_class = NULL;
ip = NULL;
pass = NULL;
+ port = 0;
};
clientitems: clientitem clientitems | clientitem;
-clientitem: clienthost | clientip | clientusername | clientclass | clientpass | clientmaxlinks;
+clientitem: clienthost | clientip | clientusername | clientclass | clientpass | clientmaxlinks | clientport;
clienthost: HOST '=' QSTRING ';'
{
char *sep = strchr($3, '@');
{
c_class = find_class($3);
if (!c_class)
- parse_error("No such connection class '%s' for Class block", $3);
+ parse_error("No such connection class '%s' for Client block", $3);
MyFree($3);
};
clientpass: PASS '=' QSTRING ';'
{
maxlinks = $3;
};
+clientport: PORT '=' expr ';'
+{
+ port = $3;
+};
killblock: KILL
{
{
stringlist[0] = $1;
stringno = 1;
-} '=' stringlist ';';
-
-stringlist: QSTRING
-{
- stringlist[1] = $1;
- stringno = 2;
-} posextrastrings
-{
+} '=' stringlist ';' {
unsigned int ii;
feature_set(NULL, (const char * const *)stringlist, stringno);
for (ii = 0; ii < stringno; ++ii)
MyFree(stringlist[ii]);
};
-posextrastrings: /* empty */ | extrastrings;
-extrastrings: extrastrings extrastring | extrastring;
+
+stringlist: stringlist extrastring | extrastring;
extrastring: QSTRING
{
if (stringno < MAX_STRINGS)
}
else
{
- struct nick_host *nh, *next;
- for (nh = smap->services; nh; nh = next)
- {
- next = nh->next;
- MyFree(nh);
- }
- MyFree(smap->name);
- MyFree(smap->command);
- MyFree(smap->prepend);
- MyFree(smap);
+ free_mapping(smap);
}
smap = NULL;
};
smap->flags |= SMAP_FAST;
};
-iauthblock: IAUTH '{'
+iauthblock: IAUTH '{' iauthitems '}' ';'
{
- tconn = 60;
- tping = 60;
-} iauthitems '}' ';'
-{
- if (!host)
- parse_error("Missing host in iauth block");
- else if (!port)
- parse_error("Missing port in iauth block");
- else
- iauth_connect(host, port, pass, tconn, tping);
- MyFree(pass);
- MyFree(host);
- pass = host = NULL;
- port = tconn = tping = 0;
+ auth_spawn(stringno, stringlist);
+ while (stringno > 0)
+ MyFree(stringlist[--stringno]);
};
iauthitems: iauthitem iauthitems | iauthitem;
-iauthitem: iauthpass | iauthhost | iauthport | iauthconnfreq | iauthtimeout;
-iauthpass: PASS '=' QSTRING ';'
+iauthitem: iauthprogram;
+iauthprogram: PROGRAM '='
{
- MyFree(pass);
- pass = $3;
-};
-iauthhost: HOST '=' QSTRING ';'
-{
- MyFree(host);
- host = $3;
-};
-iauthport: PORT '=' NUMBER ';'
-{
- port = $3;
-};
-iauthconnfreq: CONNECTFREQ '=' timespec ';'
-{
- tconn = $3;
-};
-iauthtimeout: TIMEOUT '=' timespec ';'
-{
- tping = $3;
-};
+ while (stringno > 0)
+ MyFree(stringlist[--stringno]);
+} stringlist ';';
projects / ircu2.10.12-pk.git / blobdiff