Forward port missing fixes from Kev, beware and someone else.

Add myself to doc/Authors and fix a bug I introduced in my last commit.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1081 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index ebfcee6a5489322241e191803de2770a7f755da1..054d663c96fb8fa095beb7afe6fc5806176bbb7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2004-06-23  Michael Poole <mdpoole@troilus.org>
+
+       * doc/Authors: Add contributors to ircu2.10.11 and myself.
+
+       * ircd/gline.c: Fix buglet in my forward port of Alex Badea's fix.
+
+       * configure.in: Add missing check for inttypes.h; remove obsolete
+       display of Head-in-sand, add display of epoll() engine.
+
+       * INSTALL, INSTALL_FR, doc/readme.cvs: Update descriptions of how
+       to use SourceForge's CVS server, from the u2.10.11 branch.
+
+2003-11-09 beware <steendijk@xs4all.nl>
+
+        * ircd/s_user.c: move assigning a numeric to a local client from
+       when nick is set, to when connection becomes client, to not waste
+       numerics.
+
+2004-06-08  Kevin L Mitchell  <klmitch@mit.edu>
+
+       * ircd/parse.c: don't let rank-and-file users escape HIS
+       limitations with /jupe...
+
 2004-06-18  Alex Badea  <decampos@users.sourceforge.net>
 
        * ircd/gline.c (gline_lookup): only return a gline if it's
@@ -745,7 +768,6 @@
        * ircd/res_adns.c: included sys/types.h, for non-Linux
        headers
 
->>>>>>> 1.388
 2003-03-06  Kevin L. Mitchell  <klmitch@mit.edu>
 
        * libs/dbprim: database primitives library, including

diff --git a/INSTALL b/INSTALL
index e6827a6ca6826c00c45cf8321dcadb5160999295..2b7668df63c15c5f4cddd85c69f95b7ca3b989d2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -43,13 +43,13 @@ The recommended way to get the ircu package now is to use CVS.  CVS makes
 upgrades a lot less painful and lets you get the latest package.
 
 The first thing you need to do is login to the cvs server:
-# cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs login
+# cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu login
 
 (we recommend that you cut and paste the above line to use it :)
-When it prompts you for a password enter "anoncvs".
+When it prompts you for a password hit enter since there isn't one.
 
 To check out the the last stable version of ircu, use:
-# cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs checkout -P ircu2.10
+# cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -P ircu2.10
 
 To update your source tree to the latest version, run "cvs update -dP" from within the
 ircu2.10 directory. For more information, see http://coder-com.undernet.org.

diff --git a/INSTALL_FR b/INSTALL_FR
index 206c2c71231ef74280dd7faf5d92402018cf3503..d29054c09dc4a2bb6fb7467406084eb5a3e66bea 100644 (file)
--- a/INSTALL_FR
+++ b/INSTALL_FR
@@ -25,7 +25,7 @@ identifiez envers le serveur.
 
 Avec la commande que voici:
 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs login
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu login
 
 (Nous recommandons que vous coupez et collez la ligne ci-dessus pour
 l'utiliser :). Quand il insiste pour un mot de passe écriver
@@ -53,12 +53,11 @@ branchement, n'employez aucun flag "-r".
 
 Pour vérifier la version, tapez:
 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs checkout
-   -P irc2.10
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -P ircu2.10
 
 Les deux lignes ci-dessus ne devraient pas avoir une entrée entre
 eux. Si vous voulez utiliser un autre version, placez le flag "-r"
-approprié après le "checkout".  Ceci créera un répertoire irc2.10, et
+approprié après le "co".  Ceci créera un répertoire ircu2.10, et
 mettra tous les fichiers dedans.
 
 Pour avoir la dernière version, tapez "cvs update -dP".

diff --git a/configure.in b/configure.in
index c3f297455bd9f532aeaaa454487bd7c7b0ceb571..c381605e3a662867b2815c54caa9e001768eab97 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -113,7 +113,7 @@ AC_SEARCH_LIBS(res_mkquery, resolv, ,
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(poll.h sys/devpoll.h sys/epoll.h sys/event.h)
+AC_CHECK_HEADERS(inttypes.h poll.h sys/devpoll.h sys/epoll.h sys/event.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics
 dnl AC_C_CONST
@@ -742,7 +742,6 @@ ircu is now hopefully configured for your system.
   Warnings:            $unet_cv_enable_warnings
   Debug:               $unet_cv_enable_debug
   Profile:             $unet_cv_enable_profile
-  Head-in-sand:        $unet_cv_enable_headinsand
   ADNS:                $unet_cv_enable_adns
   Owner/mode:          $unet_cv_with_owner.$unet_cv_with_group ($unet_cv_with_mode)
   Chroot:              $unet_cv_with_chroot
@@ -756,4 +755,5 @@ ircu is now hopefully configured for your system.
   poll() engine:       $unet_cv_enable_poll
   kqueue() engine:     $unet_cv_enable_kqueue
   /dev/poll engine:    $unet_cv_enable_devpoll
+  epoll() engine:      $unet_cv_enable_epoll
 "])

diff --git a/doc/Authors b/doc/Authors
index dcdc66893b1e589eba874fc1f52cc6a9f4da6cea..77ee1219273485291dcdc17de8a7c13c9134470e 100644 (file)
--- a/doc/Authors
+++ b/doc/Authors
@@ -179,11 +179,11 @@ Trio <trio@b62897.STUDENT.CWRU.Edu>
 WildThang <dvmitche@antietam.nssl.uoknor.edu>
 Xorath <vorac@wheel.dcn.davis.ca.us>
 
-UNDERNET (2000 - 2003)
+UNDERNET (2000 - 2004)
 --------
 
-The Undernet versions (P9, P10 and u2.10.11) are based on ircu2.10.07
-and contain many hours of work by Coder Commitee.
+The Undernet versions (P9, P10, u2.10.11 and u2.10.12) are based on
+ircu2.10.07 and contain many hours of work by Coder Commitee.
 The number of protocol enhancements, changes and additions
 that have been added are too many to summarize. All patches are kept in the
 cvs repository at http://coder-com.undernet.org/.  Discussions on this
@@ -202,10 +202,24 @@ Kev <klmitch@mit.edu>
 Delete <delete@cyberabuse.org>
 Ghostwolf <foxxe@wtfs.net>
 Braden <dbtem@yahoo.com>
-net <simms@LUCIDA.QC.CA>
+net <net@astrolink.org>
 Steven <steven@doyle.net>
 OmniDynmc <omni@dynmc.net>
 Dianora <db@db.net>
-Sengaia <sengaia@hallucination.net>
+Sengaia <sengaia@undernet.org>
 Cyberdude <Cyberdude@undernet.org>
 Maniac- <maniac@cetlink.net>
+Vampire- <vampire@p16.pub.ro>
+mbuna <mbuna@bugged.org>
+beware <steendijk@tomaatnet.nl>
+n3tguy <netguy@spidernet.net>
+reed <reed@reedloden.com>
+Math <math@rootservices.net>
+hikari <shadow@undernet.org>
+Bleep <tom.helvey@cox.net>
+froo <froo@quakenet.org>
+splidge <splidge@quakenet.org>
+Zarjazz <zarjazz@quakenet.org>
+Spike <ekips@pandora.be>
+Jeekay <jeekay@netgamers.org>
+Entrope <entrope@gamesurge.net>

diff --git a/doc/readme.cvs b/doc/readme.cvs
index aea31ca43756f4184ca8aa37a8c5308c6a088c0f..2a160f9244a2001e5f8b15b9c8539f3f1c3090d7 100644 (file)
--- a/doc/readme.cvs
+++ b/doc/readme.cvs
@@ -1,4 +1,3 @@
-
 Notes on checking out from the Undernet CVS archive and maintenance.
 
 General Strategy:
@@ -15,7 +14,7 @@ release. Fixes after release will be tagged with a patchlevel tag.
 You check out a tagged release by specifying the -r tag option to cvs.
 This is the command to check out the most recent tagged version of
 ircu2.10.07:
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs co -r u2_10_07_pl6 -P ircu2.10
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -r u2_10_07_pl6 -P ircu2.10
 
 Developers doing maintenance and bug fixes should only check out the
 current tagged patchlevel for the affected version. Once the fix has
@@ -27,7 +26,7 @@ maintenance only branch.
 
 If you have any questions on how to check out tagged versions check out
 the coder-com web page http://coder-com.undernet.org/cvs.html or the cvs
-manual page. If you're really stumped feel free to ask on coder-com.
+manual page. If you're really stumped feel free to ask in #coder-com.
 
 We will put out new tarballs for every tagged release which will be
 available on the coder-com web page.
@@ -58,25 +57,25 @@ proven stable they will be merged into the main tagged trunk by the
 maintainer.
 
 Where to get CVS:
-http://www.loria.fr/~molli/cvs-index.html
+http://www.cvshome.org
 
 Checking out:
 First you need to login to cvs: 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs login
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu login
 
-It will prompt you for a password. The password is "anoncvs". 
+It will prompt you for a password. There is no password so hit enter.
 
 To check out the recommended patchlevel for ircu2.10.07 use: 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs co -r u2_10_07_pl6 -P ircu2.10
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -r u2_10_07_pl6 -P ircu2.10
 
 For the ircu2.10.10 beta archive use: 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs co -r u2_10_10_beta06 -P ircu2.10
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -r u2_10_10_beta06 -P ircu2.10
 
 To check out the current development archive use: 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs co -P ircu2.10
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -P ircu2.10
 
 For the ircu3 pipedream archive use: 
-cvs -d :pserver:anoncvs@coder-com.undernet.org:/home/coder-com/cvs co -P ircu3
+cvs -d :pserver:anonymous@cvs.undernet.org:/cvsroot/undernet-ircu co -P ircu3
 
 When you want to update your source tree later to the latest version, use 
 cvs update -P

diff --git a/ircd/gline.c b/ircd/gline.c
index 2583e0d9125627c0e837a90afe00714e0097ec6b..7201b96933a62d2876639f0e2d47e83ff4b2db79 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -672,11 +672,10 @@ gline_lookup(struct Client *cptr, unsigned int flags)
       else {
         if (match(gline->gl_host, (cli_user(cptr))->realhost) != 0) 
           continue;
-        if (!GlineIsActive(gline))
-          continue;
       }
     }
-    return gline;
+    if (GlineIsActive(gline))
+      return gline;
   }
   /*
    * No Glines matched

diff --git a/ircd/parse.c b/ircd/parse.c
index 6e539cf57a0d5b4c01fef6f89e83c39ce70ae2bc..ea7c83656e2e9a40c96516665ff9acd86b5022f8 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -495,7 +495,7 @@ struct Message msgtab[] = {
     TOK_JUPE,
     0, MAXPARA, MFLG_SLOW, 0, NULL,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_unregistered, m_jupe, ms_jupe, mo_jupe, m_ignore }
+    { m_unregistered, m_not_oper, ms_jupe, mo_jupe, m_ignore }
   },
   {
     MSG_OPMODE,

diff --git a/ircd/s_user.c b/ircd/s_user.c
index c77ef6f170eb7e4ee213d75bf4af60356b118c2f..4082ea39c49ac11b31e6627f2b310b61c3cf1464 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -540,7 +540,7 @@ int register_user(struct Client *cptr, struct Client *sptr,
   if (MyConnect(sptr)) {
     cli_handler(sptr) = CLIENT_HANDLER;
     release_dns_reply(sptr);
-
+    SetLocalNumNick(sptr);
     send_reply(sptr,
                RPL_WELCOME,
                feature_str(FEAT_NETWORK),
@@ -804,7 +804,6 @@ int set_nick_name(struct Client* cptr, struct Client* sptr,
       cli_user(sptr) = make_user(sptr);
       cli_user(sptr)->server = &me;
     }
-    SetLocalNumNick(sptr);
     hAddClient(sptr);
 
     /*