Merge branch 'maint'

* maint:
  * Add HQ as an owner when running in terminal emulation
  * Consider any channel users have flags on for partyline cmds (fixes .adduser)

doc/UPDATES

@@ -4,6 +4,8 @@ release
 
 maint
   * 'make' on BSD will now redirect to gmake.
+  * Fix partyline cmds for |m and |o users who do not have console set correctly. (.adduser)
+  * Allow simulated terminal (HQ) user to access owners (ie, .chpass owner)
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart

src/chanprog.c

@@ -522,6 +522,11 @@ void load_internal_users()
     }
   }
 
+  // Add HQ in if needed
+  if (!backgrd && term_z) {
+    strlcat(owner, ",HQ", sizeof(owner));
+  }
+
 }
 
 static struct userrec* add_bot_userlist(char* bot) {

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)
 {
-  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_table_t *table = NULL;
   char *args = strdup(text);
   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");
   size_t cmdlen = strlen(cmd);

src/main.h

@@ -17,7 +17,7 @@ enum {
 extern int		role, default_flags, default_uflags, do_confedit,
 			updating, do_restart;
 extern bool		use_stderr, backgrd, used_B, term_z, loading, have_linked_to_hub, restart_was_update, restarting, safe_to_log;
-extern char		tempdir[], *binname, owner[], version[151], ver[101], quit_msg[], *socksfile;
+extern char		tempdir[], *binname, owner[121], version[151], ver[101], quit_msg[], *socksfile;
 extern time_t		online_since, now, restart_time;
 extern egg_timeval_t	egg_timeval_now;
 extern uid_t		myuid;