Merge chanserv-live into default.

[irc/quakenet/newserv.git] / trusts / trusts.c

diff --git a/trusts/trusts.c b/trusts/trusts.c
index ab0f5c8b8a1307caf261de29fe0c7026281aa462..c34974bbad50aa2619d8b648c0cc8cc606e65b28 100644 (file)
--- a/trusts/trusts.c
+++ b/trusts/trusts.c
@@ -69,13 +69,13 @@ static void whoisfn(int hooknum, void *arg) {
   triggerhook(HOOK_CONTROL_WHOISREPLY, message);
 
   if (th->maxpernode > 0) {
-    snprintf(message, sizeof(message), "Node      : %s", CIDRtostr(np->p_ipaddr, th->nodebits));
+    snprintf(message, sizeof(message), "Node      : %s", CIDRtostr(np->ipaddress, th->nodebits));
     triggerhook(HOOK_CONTROL_WHOISREPLY, message);
 
     patricia_node_t *node;
     int usercount = 0;
 
-    node = refnode(iptree, &(np->p_ipaddr), th->nodebits);
+    node = refnode(iptree, &(np->ipaddress), th->nodebits);
     usercount = node->usercount;
     derefnode(iptree, node);
 
@@ -129,7 +129,7 @@ int registertgext(const char *name) {
     return -1;
   }
 
-  for(i=0;i<MAXNICKEXTS;i++) {
+  for(i=0;i<MAXTGEXTS;i++) {
     if(!tgextnames[i]) {
       tgextnames[i] = getsstring(name, 100);
       return i;