* Fixed up the cmdpass stuff

svn: 707

src/cfg.c

@@ -5,6 +5,7 @@
  */
 
 #include "common.h"
+#include "cmds.h"
 #include "cfg.h"
 #include "userrec.h"
 #include "misc.h"
@@ -18,6 +19,9 @@
 #include "chan.h"
 #include "tandem.h"
 #include "modules.h"
+#ifdef S_DCCPASS
+#include "botnet.h"
+#endif /* S_DCCPASS */
 #include <net/if.h>
 
 #include "stat.h"
@@ -714,7 +718,7 @@ void init_config()
 }
 
 #ifdef S_DCCPASS
-int check_cmd_pass(char *cmd, char *pass)
+int check_cmd_pass(const char *cmd, char *pass)
 {
   struct cmd_pass *cp = NULL;
 
@@ -730,7 +734,7 @@ int check_cmd_pass(char *cmd, char *pass)
   return 0;
 }
 
-int has_cmd_pass(char *cmd) 
+int has_cmd_pass(const char *cmd) 
 {
   struct cmd_pass *cp = NULL;
 

src/cfg.h

@@ -25,8 +25,8 @@ void got_config_share(int idx, char * ln);
 void userfile_cfg_line(char *ln);
 void trigger_cfg_changed();
 #ifdef S_DCCPASS
-int check_cmd_pass(char *,char *);
-int has_cmd_pass(char *);
+int check_cmd_pass(const char *, char *);
+int has_cmd_pass(const char *);
 void set_cmd_pass(char *, int);
 #endif /* S_DCCPASS */
 #endif /* MAKING_MODS */

src/cmds.c

@@ -460,11 +460,13 @@ static void cmd_botconfig(struct userrec *u, int idx, char *par)
 #ifdef S_DCCPASS
 static void cmd_cmdpass(struct userrec *u, int idx, char *par)
 {
-  struct tcl_bind_mask_b *hm = NULL;
+  bind_entry_t *entry = NULL;
+  bind_table_t *table = NULL;
   char *cmd = NULL, *pass = NULL;
   int i, l = 0;
 
   /* cmdpass [command [newpass]] */
+  table = bind_table_lookup("dcc");
   cmd = newsplit(&par);
   putlog(LOG_CMDS, "*", STR("#%s# cmdpass %s ..."), dcc[idx].nick, cmd[0] ? cmd : "");
   pass = newsplit(&par);
@@ -476,42 +478,24 @@ static void cmd_cmdpass(struct userrec *u, int idx, char *par)
   for (i = 0; cmd[i]; i++)
     cmd[i] = tolower(cmd[i]);
 
-  if (!egg_strcasecmp(cmd, "op")) l++;
-  else if (!egg_strcasecmp(cmd, "act")) l++;
-  else if (!egg_strcasecmp(cmd, "adduser")) l++;
-  else if (!egg_strcasecmp(cmd, "channel")) l++;
-  else if (!egg_strcasecmp(cmd, "deluser")) l++;
-  else if (!egg_strcasecmp(cmd, "deop")) l++;
-  else if (!egg_strcasecmp(cmd, "devoice")) l++;
-  else if (!egg_strcasecmp(cmd, "getkey")) l++;
-  else if (!egg_strcasecmp(cmd, "find")) l++;
-  else if (!egg_strcasecmp(cmd, "invite")) l++;
-  else if (!egg_strcasecmp(cmd, "kick")) l++;
-  else if (!egg_strcasecmp(cmd, "kickban")) l++;
-  else if (!egg_strcasecmp(cmd, "mdop")) l++;
-  else if (!egg_strcasecmp(cmd, "msg")) l++;
-  else if (!egg_strcasecmp(cmd, "reset")) l++;
-  else if (!egg_strcasecmp(cmd, "resetbans")) l++;
-  else if (!egg_strcasecmp(cmd, "resetexempts")) l++;
-  else if (!egg_strcasecmp(cmd, "resetinvites")) l++;
-  else if (!egg_strcasecmp(cmd, "say")) l++;
-  else if (!egg_strcasecmp(cmd, "topic")) l++;
-  else if (!egg_strcasecmp(cmd, "voice")) l++;
-  else if (!egg_strcasecmp(cmd, "clearqueue")) l++;
-  else if (!egg_strcasecmp(cmd, "dump")) l++;
-  else if (!egg_strcasecmp(cmd, "jump")) l++;
-  else if (!egg_strcasecmp(cmd, "servers")) l++;
-  else if (!egg_strcasecmp(cmd, "authed")) l++;
+  /* need to check for leaf cmds, and set l > 0 here */
 
   if (!l) {
-    for (hm = H_dcc->first; hm; hm = hm->next)
-      if (!egg_strcasecmp(cmd, hm->mask))
+    int found = 0;
+
+    for (entry = table->entries; entry && entry->next; entry = entry->next) {
+      if (!egg_strcasecmp(cmd, entry->mask)) {
+        found++;
         break;
-    if (!hm) {
+      }
+    }
+
+    if (!found) {
       dprintf(idx, STR("No such DCC command\n"));
       return;
     }
   }
+
   if (pass[0]) {
     char epass[36] = "", tmp[256] = "";
 

src/core_binds.c

@@ -11,6 +11,9 @@
 #include "users.h"
 #include "misc.h"
 #include "tclhash.h"
+#ifdef S_DCCPASS
+#include "cfg.h"
+#endif /* S_DCCPASS */
 
 extern cmd_t 		C_dcc[];
 extern struct dcc_t 	*dcc;
@@ -53,41 +56,45 @@ void check_bind_dcc(const char *cmd, int idx, const char *text)
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   int x;
 #ifdef S_DCCPASS
+  bind_entry_t *entry = NULL;
+  bind_table_t *table = NULL;
   int found = 0;
+  char *args = NULL;
 #endif
 
   get_user_flagrec(dcc[idx].user, &fr, dcc[idx].u.chat->con_chan);
 
 #ifdef S_DCCPASS
-  for (hm = H_dcc->first; hm; hm = hm->next) {
-    if (!egg_strcasecmp(cmd, hm->mask)) {
+  args = strdup(text);
+
+  table = bind_table_lookup("dcc");
+  for (entry = table->entries; entry && entry->next; entry = entry->next) {
+    if (!egg_strcasecmp(cmd, entry->mask)) {
       found = 1;
       break;
     }
   }
+
   if (found) {
     if (has_cmd_pass(cmd)) {
-      char *p = NULL, work[1024] = "", pass[128] = "";
+      char *p = NULL, pass[128] = "";
 
       p = strchr(args, ' ');
       if (p)
         *p = 0;
       strncpyz(pass, args, sizeof(pass));
-      if (check_cmd_pass(cmd, pass)) {
-        if (p)
-          *p = ' ';
-        strncpyz(work, args, sizeof(work));
-        p = work;
-        newsplit(&p);
-        strcpy(args, p);
-      } else {
+
+      if (!check_cmd_pass(cmd, pass)) {
         dprintf(idx, "Invalid command password. Use %scommand password arguments\n", dcc_prefix);
         putlog(LOG_MISC, "*", "%s attempted %s%s with missing or incorrect command password", dcc[idx].nick, dcc_prefix, cmd);
-        return 0;
+        free(args);
+        return;
       }
     }
   }
+  free(args);
 #endif /* S_DCCPASS */
+
   x = check_bind(BT_dcc, cmd, &fr, dcc[idx].user, idx, text);
   putlog(LOG_DEBUG, "*", "%s RETURNED: %d", cmd, x);
   if (x == -1)

src/tclhash.c

@@ -214,6 +214,19 @@ int bind_entry_modify(bind_table_t *table, int id, const char *mask, const char
 	return(0);
 }
 
+/* void blah()
+{
+  bind_entry_t *entry = NULL;
+  bind_table_t *table = NULL;
+
+  table = bind_table_lookup_or_fake("dcc");
+
+  for (entry = table->entries; entry && entry->next; entry = entry->next) {
+    printf("MASK: %s\n", entry->mask);
+  }
+}
+*/
+
 int bind_entry_add(bind_table_t *table, const char *flags, const char *mask, const char *function_name, int bind_flags, Function callback, void *client_data)
 {
 	bind_entry_t *entry = NULL, *old_entry = NULL;