Make list of trust server accounts rehashable.

--HG--
branch : shroudtrusts

diff --git a/trusts/trusts_policy.c b/trusts/trusts_policy.c
index 05e338d209c7f2069a2cb625ce136c7f534225ea..8bc8f5c6d11a920c3317ec06175cba5685ea1a51 100644 (file)
--- a/trusts/trusts_policy.c
+++ b/trusts/trusts_policy.c
@@ -229,18 +229,24 @@ static int handletrustauth(trustsocket *sock, char *server_name, char *mac) {
     }
   }
 
-  if (!password)
+  if (!password) {
+    controlwall(NO_OPER, NL_TRUSTS, "Invalid servername for policy socket: '%s'", server_name);
     return trustkillconnection(sock, "Invalid servername.");
+  }
 
   hmacmd5 h;
   hmacmd5_init(&h, (unsigned char *)password, strlen(password));
   hmacmd5_update(&h, (unsigned char *)hmac_printhex(sock->nonce, noncehexbuf, NONCELEN), NONCELEN * 2);
   hmacmd5_final(&h, digest);
-  if(hmac_strcmp(mac, hmac_printhex(digest, hexbuf, sizeof(digest))))
+  if(hmac_strcmp(mac, hmac_printhex(digest, hexbuf, sizeof(digest)))) {
+    controlwall(NO_OPER, NL_TRUSTS, "Invalid password for policy socket with servername '%s'.", server_name);
     return trustkillconnection(sock, "Bad MAC.");
+  }
 
   sock->authed = 1;
   strncpy(sock->authuser, server_name, SERVERLEN);
+
+  controlwall(NO_OPER, NL_TRUSTS, "Successful authentication for policy socket with servername '%s'.", server_name);
   return trustdowrite(sock, "AUTHOK");
 }
 
@@ -511,27 +517,10 @@ static int trusts_cmdtrustsockets(void *source, int cargc, char **cargv) {
   return CMD_OK;
 }
 
-void _init(void) {
-  sstring *m;
+void loadtrustaccounts(void) {
   array *accts;
-  int trustport;
-
-  countext = registertgext("count");
-  if(countext == -1)
-    return;
-
-  m = getconfigitem("trusts_policy", "enforcepolicy");
-  if(m)
-    enforcepolicy = atoi(m->content);
-
-  m = getconfigitem("trusts_policy", "trustport");
-  if(m)
-    trustport = atoi(m->content);
-  else
-    trustport = DEFAULT_TRUSTPORT;
 
-  if(trustport)
-    listenerfd = createlistenersock(trustport);
+  memset(trustaccounts, 0, sizeof(trustaccounts));
 
   accts = getconfigitems("trusts_policy", "server");
   if(!accts) {
@@ -547,26 +536,55 @@ void _init(void) {
         Error("trusts_policy", ERR_INFO, "Too many servers specified.");
         break;
       }
-      
+
       strncpy(server, servers[i]->content, sizeof(server));
-      
+
       pos = strchr(server, ',');
-      
+
       if(!pos) {
         Error("trusts_policy", ERR_INFO, "Server line is missing password: %s", server);
         continue;
       }
-      
+
       *pos = '\0';
-      
+
       trustaccounts[i].used = 1;
       strncpy(trustaccounts[i].server, server, SERVERLEN);
       strncpy(trustaccounts[i].password, pos+1, TRUSTPASSLEN);
     }
   }
-    
+}
+
+static void trustaccounts_rehash(int hooknum, void *arg) {
+  loadtrustaccounts();
+}
+
+void _init(void) {
+  sstring *m;
+  int trustport;
+
+  countext = registertgext("count");
+  if(countext == -1)
+    return;
+
+  m = getconfigitem("trusts_policy", "enforcepolicy");
+  if(m)
+    enforcepolicy = atoi(m->content);
+
+  m = getconfigitem("trusts_policy", "trustport");
+  if(m)
+    trustport = atoi(m->content);
+  else
+    trustport = DEFAULT_TRUSTPORT;
+
+  if(trustport)
+    listenerfd = createlistenersock(trustport);
+
+  loadtrustaccounts();
+
   registerhook(HOOK_TRUSTS_NEWNICK, policycheck_irc);
-  registerhook(HOOK_TRUSTS_LOSTNICK, policycheck_irc);
+  registerhook(HOOK_TRUSTS_LOSTNICK, &policycheck_irc);
+  registerhook(HOOK_CORE_REHASH, trustaccounts_rehash);
 
   registercontrolhelpcmd("trustpolicy", NO_DEVELOPER, 1, trusts_cmdtrustpolicy, "Usage: trustpolicy ?1|0?\nEnables or disables policy enforcement. Shows current status when no parameter is specified.");
   registercontrolhelpcmd("trustsockets", NO_DEVELOPER, 0, trusts_cmdtrustsockets, "Usage: trustsockets\nLists all currently active TRUST sockets.");
@@ -588,6 +606,7 @@ void _fini(void) {
 
   deregisterhook(HOOK_TRUSTS_NEWNICK, policycheck_irc);
   deregisterhook(HOOK_TRUSTS_LOSTNICK, policycheck_irc);
+  deregisterhook(HOOK_CORE_REHASH, trustaccounts_rehash);
 
   deregistercontrolcmd("trustpolicy", trusts_cmdtrustpolicy);
   deregistercontrolcmd("trustsockets", trusts_cmdtrustsockets);