Fix misapplied patches from the GameSurge branch.

* src/nickserv.c (cmd_handleinfo): Use IsStaff() rather than IsSupport().
* src/opserv.c (cmd_block): Use C style comment, not C++ style.
  (is_oper_victim): Likewise.

diff --git a/src/nickserv.c b/src/nickserv.c
index dc6eeb7c9529190cddaaef4295c843e32f485e01..305cfad8df465972fb69364fe1946ce7e3569cb2 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1368,7 +1368,7 @@ static NICKSERV_FUNC(cmd_handleinfo)
         reply(type);
     }
 
-    if (oper_has_access(user, cmd->parent->bot, 0, 1) || IsSupport(user)) {
+    if (oper_has_access(user, cmd->parent->bot, 0, 1) || IsStaff(user)) {
         if (!hi->notes) {
             reply("NSMSG_HANDLEINFO_NO_NOTES");
         } else {

diff --git a/src/opserv.c b/src/opserv.c
index 3945216f94fa42bf671d2c096532a7ba27610afa..55640af0704b2b8c6e78c8e9d6e8b85c4f038cd4 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -807,7 +807,7 @@ static MODCMD_FUNC(cmd_block)
         offset = 3;
     }
     if(duration && duration != opserv_conf.block_gline_duration) {
-        // We require more access when the duration is not the default block duration.
+        /* We require more access when the duration is not the default block duration. */
         gline_cmd = dict_find(cmd->parent->commands, "gline", NULL);
         if(!gline_cmd)
         {
@@ -3318,7 +3318,7 @@ is_oper_victim(struct userNode *user, struct userNode *target, int match_opers,
                   || (target->handle_info
                       && target->handle_info->opserv_level > user->handle_info->opserv_level));
 
-    // If we don't need an ip check or want to hit opers or the the "cheap" check already disqualified the target, we are done.
+    /* If we don't need an ip check or want to hit opers or the the "cheap" check already disqualified the target, we are done. */
     if (!check_ip || match_opers || !is_victim)
         return is_victim;