Replace privilege-controlling Feature settings with

[ircu2.10.12-pk.git] / ircd / m_oper.c

diff --git a/ircd/m_oper.c b/ircd/m_oper.c
index d334d68e41e6ba6cb31ced72ed19cf3233b4e95a..002b36d90a8e937c800bcc408d9b3ae45daa293a 100644 (file)
--- a/ircd/m_oper.c
+++ b/ircd/m_oper.c
@@ -138,10 +138,10 @@ int m_oper(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (EmptyString(name) || EmptyString(password))
     return need_more_params(sptr, "OPER");
 
-  aconf = find_conf_exact(name, cli_username(sptr), cli_sockhost(sptr), CONF_OPS);
+  aconf = find_conf_exact(name, cli_username(sptr), cli_sockhost(sptr), CONF_OPERATOR);
   if (!aconf) 
     aconf = find_conf_exact(name, cli_username(sptr),
-                            ircd_ntoa((const char*) &(cli_ip(cptr))), CONF_OPS);
+                            ircd_ntoa((const char*) &(cli_ip(cptr))), CONF_OPERATOR);
 
   if (!aconf || IsIllegal(aconf))
   {
@@ -150,7 +150,7 @@ int m_oper(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
                         parv[0], cli_user(sptr)->username, cli_sockhost(sptr));
     return 0;
   }
-  assert(0 != (aconf->status & CONF_OPS));
+  assert(0 != (aconf->status & CONF_OPERATOR));
 
   if (oper_password_match(password, aconf->passwd))
   {
@@ -163,14 +163,10 @@ int m_oper(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
                           cli_sockhost(sptr));
       return 0;
     }
-    if (CONF_LOCOP == aconf->status) {
-      ClearOper(sptr);
-      SetLocOp(sptr);
-    }
-    else {
-      /*
-       * prevent someone from being both oper and local oper
-       */
+    SetLocOp(sptr);
+    client_set_privs(sptr, aconf);
+    if (HasPriv(sptr, PRIV_PROPAGATE))
+    {
       ClearLocOp(sptr);
       SetOper(sptr);
       ++UserStats.opers;
@@ -182,7 +178,6 @@ int m_oper(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     SetFlag(sptr, FLAG_DEBUG);
     
     set_snomask(sptr, SNO_OPERDEFAULT, SNO_ADD);
-    client_set_privs(sptr, aconf);
     cli_max_sendq(sptr) = 0; /* Get the sendq from the oper's class */
     send_umode_out(cptr, sptr, &old_mode, HasPriv(sptr, PRIV_PROPAGATE));
     send_reply(sptr, RPL_YOUREOPER);