Merge.

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

diff --git a/nterfacer/nterfacer.c b/nterfacer/nterfacer.c
index 4e8bb9b3ab3631b3e240f96f87745af7602e18ce..33c0de7b68dc99160f4a39daa009351137bde0f9 100644 (file)
--- a/nterfacer/nterfacer.c
+++ b/nterfacer/nterfacer.c
@@ -189,7 +189,7 @@ int load_permits(void) {
       continue;
     }
 
-    item->ihost = (*(struct in_addr *)host->h_addr).s_addr;
+    item->ihost = (*(struct in_addr *)host->h_addr_list[0]).s_addr;
     for(j=0;j<loaded_lines;j++) {
       if(new_permits[j].ihost == item->ihost) {
         nterface_log(nrl, NL_WARNING, "Host with items %d and %d is identical, dropping item %d.", j + 1, i + 1, i + 1);
@@ -602,7 +602,6 @@ int nterfacer_new_rline(char *line, struct esocket *socket, int *number) {
   if(argcount) {
     parsebuf = (char *)ntmalloc(strlen(pp) + 1);
     MemCheckR(parsebuf, RE_MEM_ERROR);
-    newp = parsebuf;
   
     for(newp=args[0]=parsebuf,pp++;*pp;pp++) {
       if((*pp == '\\') && *(pp + 1)) {
@@ -796,7 +795,6 @@ static void execrline(void *arg) {
 
   buf = sr->argv;
   for(i=0;i<sr->argc;i++) {
-    printf("%s\n", buf);
     argv[i] = buf;
     buf+=strlen(buf) + 1;
   }