opers now ignore nodelete

[srvx.git] / src / chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index 771b6169f462c676c2ae0d1dd3fed6408c001c00..9358d160a305c46ec36fa7d87a9f6124cf2373c9 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2391,7 +2391,7 @@ static CHANSERV_FUNC(cmd_move)
 
     REQUIRE_PARAMS(2);
 
-    if(IsProtected(channel->channel_info))
+    if(IsProtected(channel->channel_info) && !IsOper(user))
     {
         reply("CSMSG_MOVE_NODELETE", channel->name);
         return 0;
@@ -2699,7 +2699,7 @@ static CHANSERV_FUNC(cmd_merge)
         return 0;
     }
 
-    if(IsProtected(channel->channel_info))
+    if(IsProtected(channel->channel_info) && !IsOper(user))
     {
         reply("CSMSG_MERGE_NODELETE");
         return 0;
@@ -3287,7 +3287,7 @@ static CHANSERV_FUNC(cmd_opme)
         return 0;
     }
 
-    if(devnull_user_has_priv(user->handle_info, DEVNULL_MODE_OPME))
+    if(devnull_user_has_priv(user->handle_info, DEVNULL_PRIV_OPME))
     {
         change.args[0].mode = MODE_CHANOP;
         errmsg = "CSMSG_ALREADY_OPPED";
@@ -5425,7 +5425,7 @@ static CHANSERV_FUNC(cmd_csuspend)
 
     REQUIRE_PARAMS(3);
 
-    if(IsProtected(channel->channel_info))
+    if(IsProtected(channel->channel_info) && !IsOper(user))
     {
         reply("CSMSG_SUSPEND_NODELETE", channel->name);
         return 0;