Use +U instead of +u for user passwords (avoiding collisions with a

QuakeNet mode and for symmetry with +A).

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

diff --git a/ChangeLog b/ChangeLog
index f2a2d42c1674dacb1f7d21c0cace8c9c92d4897f..18531a4f0d22d86c7703f77f6310c9a2ef5e5333 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-11  Bas Steendijk <steendijk@xs4all.nl>
+
+       * include/channel.h, include/supported.h, ircd/channel.c,
+       ircd/s_err.c: Use +U instead of +u for user keys.
+
 2004-09-13  Michael Poole <mdpoole@troilus.org>
 
        * doc/example.conf: Remove sample VIRTUAL_HOST setting.

diff --git a/include/channel.h b/include/channel.h
index 545748f1d5fe978589135f5bd56ef9992b044446..c76ab208bd6d4b9a78936ca08acb84fad6a9d5f5 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -104,8 +104,8 @@ struct Client;
  */
 #define MODE_WPARAS     (MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT|MODE_APASS|MODE_UPASS)
 
-#define infochanmodes feature_bool(FEAT_OPLEVELS) ? "AbiklmnopstuvrD" : "biklmnopstvrD"
-#define infochanmodeswithparams feature_bool(FEAT_OPLEVELS) ? "Abklouv" : "bklov"
+#define infochanmodes feature_bool(FEAT_OPLEVELS) ? "AbiklmnopstUvrD" : "biklmnopstvrD"
+#define infochanmodeswithparams feature_bool(FEAT_OPLEVELS) ? "AbkloUv" : "bklov"
 
 #define HoldChannel(x)          (!(x))
 /* name invisible */

diff --git a/ircd/channel.c b/ircd/channel.c
index 90c0d62c6f93df39d962ab398634465599efa3dc..4306d36c0c6d239527e8ba815134db52cd3954fb 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -798,7 +798,7 @@ void channel_modes(struct Client *cptr, char *mbuf, char *pbuf, int buflen,
     previous_parameter = 1;
   }
   if (*chptr->mode.upass) {
-    *mbuf++ = 'u';
+    *mbuf++ = 'U';
     if (previous_parameter)
       strcat(pbuf, " ");
     if (IsServer(cptr) || (member && IsChanOp(member) && OpLevel(member) == 0)) {
@@ -1526,7 +1526,7 @@ modebuf_flush_int(struct ModeBuf *mbuf, int all)
 /*  MODE_BAN,          'b', */
     MODE_LIMIT,                'l',
 /*  MODE_APASS,                'A', */
-/*  MODE_UPASS,                'u', */
+/*  MODE_UPASS,                'U', */
     0x0, 0x0
   };
   int i;
@@ -1615,7 +1615,7 @@ modebuf_flush_int(struct ModeBuf *mbuf, int all)
            mode_char = 'A';
            break;
          case MODE_UPASS:
-           mode_char = 'u';
+           mode_char = 'U';
            break;
          default:
            mode_char = 'b';
@@ -2026,7 +2026,7 @@ modebuf_extract(struct ModeBuf *mbuf, char *buf)
     MODE_NOPRIVMSGS,   'n',
     MODE_KEY,          'k',
     MODE_APASS,                'A',
-    MODE_UPASS,                'u',
+    MODE_UPASS,                'U',
 /*  MODE_BAN,          'b', */
     MODE_LIMIT,                'l',
     MODE_REGONLY,      'r',
@@ -2075,7 +2075,7 @@ modebuf_extract(struct ModeBuf *mbuf, char *buf)
       build_string(buf, &bufpos, key, 0, ' ');
     else if (buf[i] == 'l')
       build_string(buf, &bufpos, limitbuf, 0, ' ');
-    else if (buf[i] == 'u')
+    else if (buf[i] == 'U')
       build_string(buf, &bufpos, upass, 0, ' ');
     else if (buf[i] == 'A')
       build_string(buf, &bufpos, apass, 0, ' ');
@@ -2325,8 +2325,8 @@ mode_parse_upass(struct ParseState *state, int *flag_p)
 
   if (state->parc <= 0) { /* warn if not enough args */
     if (MyUser(state->sptr))
-      need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +u" :
-                      "MODE -u");
+      need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +U" :
+                      "MODE -U");
     return;
   }
 
@@ -2375,8 +2375,8 @@ mode_parse_upass(struct ParseState *state, int *flag_p)
 
   if (!*t_str) { /* warn if empty */
     if (MyUser(state->sptr))
-      need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +u" :
-                      "MODE -u");
+      need_more_params(state->sptr, state->dir == MODE_ADD ? "MODE +U" :
+                      "MODE -U");
     return;
   }
 
@@ -2985,7 +2985,7 @@ mode_parse(struct ModeBuf *mbuf, struct Client *cptr, struct Client *sptr,
     MODE_NOPRIVMSGS,   'n',
     MODE_KEY,          'k',
     MODE_APASS,                'A',
-    MODE_UPASS,                'u',
+    MODE_UPASS,                'U',
     MODE_BAN,          'b',
     MODE_LIMIT,                'l',
     MODE_REGONLY,      'r',
@@ -3066,7 +3066,7 @@ mode_parse(struct ModeBuf *mbuf, struct Client *cptr, struct Client *sptr,
        mode_parse_apass(&state, flag_p);
        break;
 
-      case 'u': /* deal with user passes */
+      case 'U': /* deal with user passes */
         if (feature_bool(FEAT_OPLEVELS))
        mode_parse_upass(&state, flag_p);
        break;

diff --git a/ircd/s_err.c b/ircd/s_err.c
index 15a239669705e8c8c47bdc772c506b13243401be..26e8ee83e9fb9e5ba92aa6256f585a68cfa26607 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -1138,7 +1138,7 @@ static Numeric replyTable[] = {
 /* 552 */
   { ERR_CHANSECURED, "%s :Channel is older than 48 hours and secured. Cannot change Admin pass anymore", "552" },
 /* 553 */
-  { ERR_UPASSSET, "%s :Cannot remove Admin pass (+A) while User pass (+u) is still set.  First use /MODE %s -u <userpass>", "553" },
+  { ERR_UPASSSET, "%s :Cannot remove Admin pass (+A) while User pass (+U) is still set.  First use /MODE %s -U <userpass>", "553" },
 /* 554 */
   { ERR_UPASSNOTSET, "%s :Cannot set user pass (+u) while Admin pass (+A) is not set.  First use /MODE %s +A <adminpass>", "554" },
 /* 555 */