Просмотр исходного кода

Merge branch 'fix-adduser-console' into next

* fix-adduser-console:
  * Consider any channel users have flags on for partyline cmds (fixes .adduser)

Conflicts:
	doc/UPDATES
Bryan Drewery 16 лет назад
Родитель
Сommit
84d0ffdfc5
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      doc/UPDATES
  2. 2 2
      src/core_binds.c

+ 1 - 0
doc/UPDATES

@@ -8,6 +8,7 @@
 * Wraith is now linked dynamically. This should improve binary compat.
 * Wraith is now linked dynamically. This should improve binary compat.
   Compile on the oldest OS you want to support, and ensure newer ones have
   Compile on the oldest OS you want to support, and ensure newer ones have
   all necessary compat libraries.
   all necessary compat libraries.
+* Fix partyline cmds for |m and |o users who do not have console set correctly. (.adduser)
 
 
 * 'make' on BSD will now redirect to gmake.
 * 'make' on BSD will now redirect to gmake.
 
 

+ 2 - 2
src/core_binds.c

@@ -174,13 +174,13 @@ int check_bind_dcc(const char *cmd, int idx, const char *text)
 
 
 int real_check_bind_dcc(const char *cmd, int idx, const char *text, Auth *auth)
 int real_check_bind_dcc(const char *cmd, int idx, const char *text, Auth *auth)
 {
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYCH, 0, 0, 0 };
   bind_entry_t *entry = NULL;
   bind_entry_t *entry = NULL;
   bind_table_t *table = NULL;
   bind_table_t *table = NULL;
   char *args = strdup(text);
   char *args = strdup(text);
   size_t args_siz = strlen(args) + 1;
   size_t args_siz = strlen(args) + 1;
 
 
-  get_user_flagrec(dcc[idx].user, &fr, dcc[idx].u.chat->con_chan);
+  get_user_flagrec(dcc[idx].user, &fr, NULL);
 
 
   table = bind_table_lookup("dcc");
   table = bind_table_lookup("dcc");
   size_t cmdlen = strlen(cmd);
   size_t cmdlen = strlen(cmd);