- #0003285 patched by w00t, removing add_local_domain and other useless

  stuff

diff --git a/Changes b/Changes
index f0dc0ea533c1e1fb53eb79c1a07a7ece1cb84a62..f789efdc89e6299c181e0acd528158f82d429d78 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1594,3 +1594,5 @@ MOTDs
 - #0002932 reported by therock247uk, patched by WolfSage, regarding Local
   opers can /chghost /chgident /chgname on someone thats on another server on
   the network 
+- #0003285 patched by w00t, removing add_local_domain and other useless
+  stuff

diff --git a/include/h.h b/include/h.h
index 3bb366c4030befa268de3a102e66e2f05ea73d80..06ccd0c35f0a2546d7f6c31491f8411be6e9ac8a 100644 (file)
--- a/include/h.h
+++ b/include/h.h
@@ -236,7 +236,6 @@ extern MODVAR int readcalls, udpfd, resfd;
 #ifndef NEW_IO
 extern aClient *add_connection(aClient *, int);
 extern int add_listener(aConfItem *);
-extern void add_local_domain(char *, int);
 extern int check_client(aClient *, char *);
 extern int check_server(aClient *, struct hostent *, aConfItem *,
     aConfItem *, int);

diff --git a/src/s_bsd.c b/src/s_bsd.c
index 32e2c3dc0583c98e8ced046b2d3d26a96cdecee1..fe17499d6bfd9e9490f3bccc16e29741a4a4bf06 100644 (file)
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -215,33 +215,6 @@ void close_connections(void)
 #endif
 }
 
-/*
-** add_local_domain()
-** Add the domain to hostname, if it is missing
-** (as suggested by eps@TOASTER.SFSU.EDU)
-*/
-
-void add_local_domain(char *hname, int size)
-{
-#if 0
-       /* try to fix up unqualified names */
-       if (!index(hname, '.'))
-       {
-               if (!(ircd_res.options & RES_INIT))
-               {
-                       Debug((DEBUG_DNS, "res_init()"));
-                       ircd_res_init();
-               }
-               if (ircd_res.defdname[0])
-               {
-                       (void)strncat(hname, ".", size - 1);
-                       (void)strncat(hname, ircd_res.defdname, size - 2);
-               }
-       }
-#endif
-       return;
-}
-
 /*
 ** Cannot use perror() within daemon. stderr is closed in
 ** ircd and cannot be used. And, worse yet, it might have
@@ -948,53 +921,6 @@ void close_connection(aClient *cptr)
        }
 
        cptr->from = NULL;      /* ...this should catch them! >:) --msa */
-       /*
-        * fd remap to keep local[i] filled at the bottom.
-        */
-#if 0
-#ifdef DO_REMAPPING
-       if (empty > 0)
-               if ((j = LastSlot) > (i = empty) &&
-                   (local[j]->status != STAT_LOG))
-               {
-                       if (dup2(j, i) == -1)
-                               return;
-                       local[i] = local[j];
-                       local[i]->fd = i;
-#ifdef USE_SSL
-                       /* I didn't know the code above existed, which
-                          fucked up SSL -Stskeeps
-                        */
-                       if ((local[i]->flags & FLAGS_SSL) && local[i]->ssl)
-                       {
-                               /* !! RISKY !! --Stskeeps */
-                               SSL_change_fd((SSL *) local[i]->ssl,
-                                   local[i]->fd);
-                       }
-#endif
-                       local[j] = NULL;
-#ifndef NO_FDLIST
-                       /* update server list */
-                       if (IsServer(local[i]))
-                       {
-                               delfrom_fdlist(j, &busycli_fdlist);
-                               delfrom_fdlist(j, &serv_fdlist);
-                               addto_fdlist(i, &busycli_fdlist);
-                               addto_fdlist(i, &serv_fdlist);
-                       }
-                       if (IsAnOper(local[i]))
-                       {
-                               delfrom_fdlist(j, &busycli_fdlist);
-                               delfrom_fdlist(j, &oper_fdlist);
-                               addto_fdlist(i, &busycli_fdlist);
-                               addto_fdlist(i, &oper_fdlist);
-                       }
-#endif
-                       CLOSE_SOCK(j);
-                       --OpenFiles;
-               }
-#endif
-#endif
        return;
 }
 

diff --git a/src/s_conf.c b/src/s_conf.c
index eec40e6dfa99923f4c7042ad94108bd742bf1374..7b437e58e9bd3748dbaca51e11cb40601b5ac5e9 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -2455,10 +2455,6 @@ int      AllowClient(aClient *cptr, struct hostent *hp, char *sockhost, char *usernam
                {
                        hname = hp->h_name;
                        strncpyzt(fullname, hname, sizeof(fullname));
-#ifndef NEW_IO
-                       add_local_domain(fullname, HOSTLEN - strlen(fullname));
-#else /* ifndef NEW_IO */
-#endif /* ifndef NEW_IO */
                        Debug((DEBUG_DNS, "a_il: %s->%s", sockhost, fullname));
                        if (index(aconf->hostname, '@'))
                        {