Author: Michael Poole <mdpoole@troilus.org>

Log message:

Commit the code change intended for the last commit, and the ChangeLog
entry for the code change that was actually in the last commit (to fix
and clarify a startup error message).

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

diff --git a/ChangeLog b/ChangeLog
index fb274742fd92f8b30e30f2fb53ba4a095a17ed8f..50234b529ef096a32f342300bd4b248c19f40542 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-15  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/s_bsd.c (init_connection_limits): Remove errant apostrophe.
+       Print text error message when unable to set max FDs.
+

 2008-03-15  Michael Poole <mdpoole@troilus.org>
 
        * ircd/s_user.c (set_user_mode): Check for end of argument list
 2008-03-15  Michael Poole <mdpoole@troilus.org>
 
        * ircd/s_user.c (set_user_mode): Check for end of argument list

diff --git a/ircd/s_user.c b/ircd/s_user.c
index a2de84f876ed7082fac055601f11ea5edc073f89..1fdfcbf323751eaaee06cd4f28479c12ab7971cb 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1078,7 +1078,7 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc,
          do_host_hiding = 1;
        break;
       case 'r':
          do_host_hiding = 1;
        break;
       case 'r':

-       if (what == MODE_ADD) {
+       if (*(p + 1) && (what == MODE_ADD)) {

          account = *(++p);
          SetAccount(sptr);
        }
          account = *(++p);
          SetAccount(sptr);
        }