Remove old oper privilege flags.

diff --git a/doc/example.conf b/doc/example.conf
index 57354ac6099965a5bf7f12aab977ec89098854a0..6b11a56718190cfc5c2dbcd00d874999f33830d9 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -241,38 +241,14 @@ operator "god" {
 
        /* privileges: controls the activities and commands an oper is
         * allowed to do on the server.  You may prefix an option with ~ to
-        * disable it, ie ~operwall
+        * disable it, ie ~encrypted.
         *
-        * Default flags are operwall, remoteban and encrypted.
+        * Default flags are encrypted.
         *
         * Available options:
         *
         * encrypted:    the password above is encrypted [DEFAULT]
         * need_ssl:     must be using SSL/TLS to oper up
-        * local_kill:   allows local users to be /KILL'd
-        * global_kill:  allows local and remote users to be 
-        *               /KILL'd                           (OLD 'O' flag)
-        * remote:       allows remote SQUIT and CONNECT   (OLD 'R' flag)
-        * kline:        allows KLINE and DLINE            (OLD 'K' flag)
-        * unkline:      allows UNKLINE and UNDLINE        (OLD 'U' flag)
-        * nick_changes: allows oper to see nickchanges    (OLD 'N' flag)
-        *               via snomask +n
-        * rehash:       allows oper to REHASH config      (OLD 'H' flag)
-        * die:          allows DIE and RESTART            (OLD 'D' flag)
-        * admin:        gives admin privileges.  admins
-        *               may (un)load modules and see the
-        *               real IPs of servers.
-        * hidden_admin: gives admin privileges except
-        *               will not have the admin lines in
-        *               stats p and whois.
-        * xline:        allows use of /quote xline/unxline
-        * resv:         allows /quote resv/unresv and cmode +LP [DEFAULT]
-        * operwall:     allows the oper to send/receive operwalls [DEFAULT]
-        * oper_spy:     allows 'operspy' features to see through +s
-        *               channels etc. see /quote help operspy
-        * hidden_oper:  hides the oper from /stats p    (OLD UMODE +p) 
-        * remoteban:    allows remote kline etc [DEFAULT]
-        * mass_notice:  allows sending wallops and mass notices [DEFAULT]
          */
        flags = global_kill, remote, kline, unkline,
                die, rehash, admin, xline, operwall;

diff --git a/doc/reference.conf b/doc/reference.conf
index eae53c114ee1f89077e6bebd7f9b3e1679932e1d..0ddf1c7bac497fd11fe5a8f2b61aaadc7cd72a6a 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -409,30 +409,6 @@ operator "god" {
         *
         * encrypted:    the password above is encrypted [DEFAULT]
         * need_ssl:     must be using SSL/TLS to oper up
-        * local_kill:   allows local users to be /KILL'd
-        * global_kill:  allows local and remote users to be 
-        *               /KILL'd                           (OLD 'O' flag)
-        * remote:       allows remote SQUIT and CONNECT   (OLD 'R' flag)
-        * kline:        allows KLINE and DLINE            (OLD 'K' flag)
-        * unkline:      allows UNKLINE and UNDLINE        (OLD 'U' flag)
-        * nick_changes: allows oper to see nickchanges    (OLD 'N' flag)
-        *               via snomask +n
-        * rehash:       allows oper to REHASH config      (OLD 'H' flag)
-        * die:          allows DIE and RESTART            (OLD 'D' flag)
-        * admin:        gives admin privileges.  admins
-        *               may (un)load modules and see the
-        *               real IPs of servers.
-        * hidden_admin: gives admin privileges except
-        *               will not have the admin lines in
-        *               stats p and whois.
-        * xline:        allows use of /quote xline/unxline
-        * resv:         allows /quote resv/unresv and cmode +LP [DEFAULT]
-        * operwall:     allows the oper to send/receive operwalls [DEFAULT]
-        * oper_spy:     allows 'operspy' features to see through +s
-        *               channels etc. see /quote help operspy
-        * hidden_oper:  hides the oper from /stats p    (OLD UMODE +p) 
-        * remoteban:    allows remote kline etc [DEFAULT]
-        * mass_notice:  allows sending wallops and mass notices [DEFAULT]
          */
        flags = global_kill, remote, kline, unkline,
                die, rehash, admin, xline, operwall;

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 0598343661a4f6f6483d4f21ef1e2a1b73e4cfeb..916cf77e3a1115f68d07989e81f355cf1f311c70 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -140,31 +140,10 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
                        int cap, const char *format, ...);
 
 #define OPER_ENCRYPTED 0x00001
-#define OPER_KLINE     0x00002
-#define OPER_UNKLINE   0x00004
-#define OPER_LOCKILL   0x00008
-#define OPER_GLOBKILL  0x00010
-#define OPER_REMOTE    0x00020
-#define OPER_XLINE     0x00080
-#define OPER_RESV      0x00100
-#define OPER_NICKS     0x00200
-#define OPER_REHASH    0x00400
-#define OPER_DIE       0x00800
-#define OPER_ADMIN     0x01000
-#define OPER_HADMIN    0x02000
-#define OPER_OPERWALL  0x04000
-#define OPER_INVIS     0x08000
-#define OPER_SPY       0x10000
-#define OPER_REMOTEBAN 0x20000
-#define OPER_MASSNOTICE 0x40000
 #define OPER_NEEDSSL    0x80000
 /* 0x400000 and above are in client.h */
 
-#define OPER_FLAGS     (OPER_KLINE|OPER_UNKLINE|OPER_LOCKILL|OPER_GLOBKILL|\
-                        OPER_REMOTE|OPER_XLINE|OPER_RESV|\
-                        OPER_NICKS|OPER_REHASH|OPER_DIE|OPER_ADMIN|\
-                        OPER_HADMIN|OPER_OPERWALL|OPER_INVIS|OPER_SPY|\
-                        OPER_REMOTEBAN|OPER_MASSNOTICE)
+#define OPER_FLAGS     0 /* no oper privs in Client.flags2/oper_conf.flags currently */
 
 #define IsOperConfEncrypted(x) ((x)->flags & OPER_ENCRYPTED)
 #define IsOperConfNeedSSL(x)   ((x)->flags & OPER_NEEDSSL)

diff --git a/src/newconf.c b/src/newconf.c
index 2cde3ad2cdf3f27721a268b938fa6ebdde9b886f..6fe62dddd5ef115f8038200b24a067c39662c736 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -308,23 +308,6 @@ static struct mode_table umode_table[] = {
 
 static struct mode_table oper_table[] = {
        {"encrypted",           OPER_ENCRYPTED          },
-       {"local_kill",          OPER_LOCKILL            },
-       {"global_kill",         OPER_GLOBKILL|OPER_LOCKILL      },
-       {"remote",              OPER_REMOTE             },
-       {"kline",               OPER_KLINE              },
-       {"unkline",             OPER_UNKLINE            },
-       {"nick_changes",        OPER_NICKS              },
-       {"rehash",              OPER_REHASH             },
-       {"die",                 OPER_DIE                },
-       {"admin",               OPER_ADMIN              },
-       {"hidden_admin",        OPER_HADMIN             },
-       {"xline",               OPER_XLINE              },
-       {"resv",                OPER_RESV               },
-       {"operwall",            OPER_OPERWALL           },
-       {"oper_spy",            OPER_SPY                },
-       {"hidden_oper",         OPER_INVIS              },
-       {"remoteban",           OPER_REMOTEBAN          },
-       {"mass_notice",         OPER_MASSNOTICE         },
        {"need_ssl",            OPER_NEEDSSL            },
        {NULL, 0}
 };
@@ -525,7 +508,7 @@ conf_begin_oper(struct TopConf *tc)
        }
 
        yy_oper = make_oper_conf();
-       yy_oper->flags |= OPER_ENCRYPTED|OPER_RESV|OPER_OPERWALL|OPER_REMOTEBAN|OPER_MASSNOTICE;
+       yy_oper->flags |= OPER_ENCRYPTED;
 
        return 0;
 }