* Port [3148] to 1.2.13

 * Added set var 'usermode' for IRC usermode to set on connect/rehash.


svn: 3149

doc/UPDATES

@@ -12,6 +12,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Make ./binary -E default to displaying every error. (fixes #322)
 * Fix a possible memory leak with DNS. (fixes #296)
 * cmd_[bot]set now accepts wildcards (*) for listing variables. (not for setting)
+* Added set var 'usermode' for IRC usermode to set on connect/rehash.
 
 1.2.12 - http://wraith.shatow.net/milestone/1.2.12
 * Clearing a variable via 'set var -' now resets that variable to default settings. (implements #111)

misc/help.txt

@@ -1537,6 +1537,7 @@ See also: reload, backup
 [SL] $bservers6$b        Comma-separated list of servers the bot will use (FOR IPv6).
  
 [S]  $brealname$b        The bot's "real name" when connecting.
+[S]  $busermode$b        The bot's usermode on IRC. (Set on connect/rehash)
 [S]  $bnick$b            The bot's preferred nickname on IRC.
 [N]  $bnotify-time$b     The number of seconds between server notify checks for nick.
  

src/mod/server.mod/servmsg.c

@@ -156,7 +156,7 @@ void rehash_server(const char *servname, const char *nick)
 
     dprintf(DP_SERVER, "WHOIS %s\n", botname); /* get user@host */
     dprintf(DP_SERVER, "USERHOST %s\n", botname); /* get user@ip */
-    dprintf(DP_SERVER, "MODE %s +iws\n", botname);
+    dprintf(DP_SERVER, "MODE %s %s\n", botname, var_get_str_by_name("usermode"));
   }
 }
 

src/set.c

@@ -56,6 +56,7 @@ int trace;
 bool offensive_bans;
 bool manop_warn;
 char homechan[51] = "";
+char usermode[15] = "";
 
 static variable_t vars[] = {
  VAR("alias", 		alias,			VAR_STRING|VAR_LIST|VAR_NOLOC|VAR_PERM,		0, 0, DEFAULT_ALIAS),
@@ -102,6 +103,7 @@ static variable_t vars[] = {
  VAR("servers",		&serverlist,		VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,	0, 0, DEFAULT_SERVERS),
  VAR("servers6",	&serverlist,		VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,	0, 0, DEFAULT_SERVERS6),
  VAR("trace",		&trace,			VAR_INT|VAR_DETECTED,				0, 4, "die"),
+ VAR("usermode",	&usermode,		VAR_STRING|VAR_NOLHUB,				0, 0, "+iws"),
 // {NULL, NULL, 0, 0, NULL, NULL, 0, NULL, 0, 0}
  VAR(NULL,		0,			0,						0, 0, 0)
 };

src/set.h

@@ -76,5 +76,6 @@ void init_vars();
 void var_set_by_name(const char *, const char *, const char *);
 void var_set_userentry(const char *, const char *, const char *);
 int cmd_set_real(const char *, int idx, char *);
+const char *var_get_str_by_name(const char *);
 
 #endif /* !_SET_H */