Move role to flags.c

src/flags.c

@@ -32,12 +32,12 @@
 #include "userrec.h"
 #include "misc.h"
 #include "dccutil.h"
-#include "main.h"
 #include "userent.h"
 #include "users.h"
 #include "chanprog.h"
 
 flag_t FLAG[128];
+int role;
 
 void
 init_flags()

src/flags.h

@@ -16,6 +16,7 @@
 typedef uint64_t flag_t;
 
 extern flag_t FLAG[128];
+extern int role;
 
 struct flag_record {
   flag_t match;

src/main.c

@@ -95,7 +95,6 @@ char	git_version[50] = "";
 
 bool	used_B = 0;		/* did we get started with -B? */
 bool	safe_to_log = 0;
-int 	role;
 bool 	loading = 0;
 int	default_flags = 0;	/* Default user flags and */
 bool     have_linked_to_hub = 0;  /* Have we ever been linked to a hub? */

src/main.h

@@ -14,7 +14,7 @@ enum {
   CONF_STATIC
 };
 
-extern int		role, default_flags, default_uflags, do_confedit,
+extern int		default_flags, default_uflags, do_confedit,
 			updating, do_restart, do_write_userfile;
 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[121], version[151], ver[101], quit_msg[], *socksfile;