LOC fix for non-ldap LOC where ldap is available

[irc/evilnet/x3.git] / src / opserv.c

diff --git a/src/opserv.c b/src/opserv.c
index e2d0656ea484e600854786d6f3d0f11fc8d5cfbb..6a1d5209800bcb526f5fe7349e460c0a6913cd5a 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -179,6 +179,8 @@ static const struct message_entry msgtab[] = {
     { "OSMSG_OPALL_DONE", "Opped everyone on $b%s$b." },
     { "OSMSG_HOP_DONE", "Halfopped the requested lusers." },
     { "OSMSG_HOPALL_DONE", "Halfopped everyone on $b%s$b." },
+    { "OMSG_BAD_SVSNICK", "$b%s$b is an invalid nickname." },
+
     { "OSMSG_WHOIS_IDENT",      "%s (%s@%s) from %d.%d.%d.%d" },
     { "OSMSG_WHOIS_NICK",       "Nick         : %s" },
     { "OSMSG_WHOIS_HOST",       "Host         : %s@%s" },
@@ -525,7 +527,7 @@ opserv_free_waiting_connection(void *data)
 
 typedef struct opservDiscrim {
     struct chanNode *channel;
-    char *mask_nick, *mask_ident, *mask_host, *mask_info, *mask_version, *server, *reason, *accountmask, *chantarget, *mark, *mask_mark;
+    char *mask_nick, *mask_ident, *mask_host, *mask_info, *mask_version, *server, *reason, *accountmask, *chantarget, *mark, *mask_mark, *modes;
     irc_in_addr_t ip_mask;
     unsigned long limit;
     time_t min_ts, max_ts;
@@ -1630,6 +1632,23 @@ static MODCMD_FUNC(cmd_svsjoin)
     return 1;
 }
 
+static MODCMD_FUNC(cmd_svsnick)
+{
+    struct userNode *target;
+    
+    target = GetUserH(argv[1]);
+    if (!target) {
+       reply("MSG_NICK_UNKNOWN", argv[1]);
+       return 0;
+    }
+    if(!is_valid_nick(argv[2])) {
+       reply("OMSG_BAD_SVSNICK", argv[2]);
+       return 0;
+    }
+    irc_svsnick(opserv, target, argv[2]);
+    return 1;
+}
+
 static MODCMD_FUNC(cmd_join)
 {
     struct userNode *bot = cmd->parent->bot;
@@ -2060,6 +2079,10 @@ static MODCMD_FUNC(cmd_whois)
         if (IsDeaf(target)) buffer[bpos++] = 'd';
         if (target->handle_info) buffer[bpos++] = 'r';
         if (IsHiddenHost(target)) buffer[bpos++] = 'x';
+       if (IsBotM(target)) buffer[bpos++] = 'B';
+       if (IsHideChans(target)) buffer[bpos++] = 'n';
+       if (IsHideIdle(target)) buffer[bpos++] = 'I';
+       if (IsXtraOp(target)) buffer[bpos++] = 'X';
         if (IsGagged(target)) buffer_cat(" (gagged)");
         if (IsRegistering(target)) buffer_cat(" (registered account)");
         buffer[bpos] = 0;
@@ -2670,7 +2693,7 @@ opserv_new_user_check(struct userNode *user)
     }
 
     if (checkDefCon(DEFCON_NO_NEW_CLIENTS)) {
-        irc_kill(opserv, user, DefConGlineReason);
+        DelUser(user, opserv, 1, DefConGlineReason);
         return 0;
     }
 
@@ -5368,6 +5391,8 @@ opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int
             discrim->domain_depth = strtoul(argv[++i], NULL, 0);
         } else if (irccasecmp(argv[i], "clones") == 0) {
             discrim->min_clones = strtoul(argv[++i], NULL, 0);
+       } else if (irccasecmp(argv[i], "modes") == 0) {
+           discrim->modes = argv[++i];
         } else {
             send_message(user, bot, "MSG_INVALID_CRITERIA", argv[i]);
             goto fail;
@@ -5553,6 +5578,57 @@ discrim_match(discrim_t discrim, struct userNode *user)
             return 0;
     }
 
+    if (discrim->modes) {
+           unsigned int ii, matches = 0;
+        for (ii = 0; ii < strlen(discrim->modes); ii++) {
+            switch(discrim->modes[ii]) {
+                case 'O':
+                    if(IsOper(user)) matches++;
+                    break;
+                case 'o':
+                    if(IsOper(user)) matches++;
+                    break;
+                case 'i':
+                    if(IsInvisible(user)) matches++;
+                    break;
+                case 'w':
+                    if(IsWallOp(user)) matches++;
+                    break;
+                case 's':
+                    if(IsServNotice(user)) matches++;
+                    break;
+                case 'd':
+                    if(IsDeaf(user)) matches++;
+                    break;
+                case 'k':
+                    if(IsService(user)) matches++;
+                    break;
+                case 'g':
+                    if(IsGlobal(user)) matches++;
+                    break;
+                case 'h':
+                    if(IsSetHost(user)) matches++;
+                    break;
+                case 'B':
+                    if(IsBotM(user)) matches++;
+                    break;
+                case 'n':
+                    if(IsHideChans(user)) matches++;
+                    break;
+                case 'I':
+                    if(IsHideIdle(user)) matches++;
+                    break;
+                case 'X':
+                    if(IsXtraOp(user)) matches++;
+                    break;
+                case 'x':
+                    if(IsHiddenHost(user)) matches++;
+                    break;
+            }
+        }
+        if (matches != strlen(discrim->modes)) return 0;
+    }
+
     access = user->handle_info ? user->handle_info->opserv_level : 0;
     if ((access < discrim->min_level)
         || (access > discrim->max_level)) {
@@ -6944,6 +7020,7 @@ init_opserv(const char *nick)
     opserv_define_func("INVITE", cmd_invite, 100, 2, 0);
     opserv_define_func("INVITEME", cmd_inviteme, 100, 0, 0);
     opserv_define_func("JOIN", cmd_join, 601, 0, 2);
+    opserv_define_func("SVSNICK", cmd_svsnick, 999, 0, 3);
     opserv_define_func("SVSJOIN", cmd_svsjoin, 999, 0, 3);
     opserv_define_func("SVSPART", cmd_svspart, 999, 0, 3);
     opserv_define_func("JUMP", cmd_jump, 900, 0, 2);