Clean up some XXXs

diff --git a/src/exec.c b/src/exec.c
index ccc7fb4827579815d9c8253eb4136fdc346b4df9..5d36cd2d66fc4a70a5fc90a8e20356ed43879a28 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -60,8 +60,6 @@
 #include "sudo_plugin.h"
 #include "sudo_plugin_int.h"
 
-extern struct user_details user_details; /* XXX need tty name for SELinux */
-
 /* shared with exec_pty.c */
 sig_atomic_t recvsig[NSIG];
 void handler(int s);

diff --git a/src/exec_pty.c b/src/exec_pty.c
index 71d0a00b46d61b336173d722a4292314baccd66e..22c3530c5b5a5d6288aeea48757f3e8dcbb5617d 100644 (file)
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -111,8 +111,6 @@ static void sync_ttysize(int src, int dst);
 static void deliver_signal(pid_t pid, int signo);
 static int safe_close(int fd);
 
-extern struct user_details user_details; /* XXX need tty name for SELinux */
-
 /*
  * Cleanup hook for error()/errorx()
  */
@@ -538,10 +536,6 @@ fork_pty(struct command_details *details, char *argv[], char *envp[],
     sa.sa_flags = SA_INTERRUPT; /* do not restart syscalls */
     sa.sa_handler = handler;
     sigaction(SIGTSTP, &sa, NULL);
-#if 0 /* XXX - add these? */
-    sigaction(SIGTTIN, &sa, NULL);
-    sigaction(SIGTTOU, &sa, NULL);
-#endif
 
     if (foreground) {
        /* Copy terminal attrs from user tty -> pty slave. */

diff --git a/src/parse_args.c b/src/parse_args.c
index 5948aef587f7678d05eb0b7532eac18b2a63c2b7..932bfbd7ffba932bf424d5e0b52e1d5ac7ac4cba 100644 (file)
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -56,11 +56,7 @@
 extern char *optarg;
 extern int optind;
 
-extern struct user_details user_details;
-
-/* XXX - better home for these and extern in header file */
 int tgetpass_flags;
-const char *list_user, *runas_user, *runas_group;
 
 /*
  * Local functions.

diff --git a/src/sudo.c b/src/sudo.c
index ca6f0c08d437bd42a3c15ec6ffb1a3e9505b6610..93d52966d6a6f4c379b0ec68480dc4ce89803fa5 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -87,6 +87,8 @@
  */
 struct plugin_container policy_plugin;
 struct plugin_container_list io_plugins;
+struct user_details user_details;
+const char *list_user, *runas_user, *runas_group; /* extern for parse_args.c */
 int debug_level;
 
 /*
@@ -98,12 +100,6 @@ static char **get_user_info(struct user_details *);
 static void command_info_to_details(char * const info[],
     struct command_details *details);
 
-/* XXX - header file */
-extern const char *list_user, *runas_user, *runas_group;
-
-/* Needed by tgetpass when executing askpass helper */
-struct user_details user_details;
-
 #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
 static struct rlimit corelimit;
 #endif /* RLIMIT_CORE && !SUDO_DEVEL */

diff --git a/src/sudo.h b/src/sudo.h
index 1fdc426110400bc8d12e986a21efbe53db535d96..5db596c5b56dd9dfac20cdb8b122dcdbe7c1787e 100644 (file)
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -192,6 +192,7 @@ int atobool(const char *str);
 /* parse_args.c */
 int parse_args(int argc, char **argv, int *nargc, char ***nargv,
     char ***settingsp, char ***env_addp);
+extern int tgetpass_flags;
 
 /* get_pty.c */
 int get_pty(int *master, int *slave, char *name, size_t namesz, uid_t uid);
@@ -204,8 +205,9 @@ int exec_setup(struct command_details *details, const char *ptyname, int ptyfd);
 int run_command(struct command_details *details, char *argv[],   
     char *envp[]);
 void sudo_debug(int level, const char *format, ...) __printflike(2, 3);
-
 extern int debug_level;
+extern const char *list_user, *runas_user, *runas_group;
+extern struct user_details user_details;
 
 /* sudo_edit.c */
 int sudo_edit(struct command_details *details, char *argv[], char *envp[]);

diff --git a/src/sudo_edit.c b/src/sudo_edit.c
index a7062722bb5223e3a6123419f39bef73ba8eae84..48f7bd436edee3d1bbeb0d8dccb2c4173a774484 100644 (file)
--- a/src/sudo_edit.c
+++ b/src/sudo_edit.c
@@ -55,8 +55,6 @@
 
 #include "sudo.h"
 
-extern struct user_details user_details;
-
 static void
 switch_user(uid_t euid, gid_t egid, int ngroups, GETGROUPS_T *groups)
 {

diff --git a/src/tgetpass.c b/src/tgetpass.c
index d4abad01b770cb93c64cd49f976ad2f676f845ea..dbffe4879f85dfa673d463221891e5c1820d6b34 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -62,8 +62,6 @@ static void handler(int);
 static char *getln(int, char *, size_t, int);
 static char *sudo_askpass(const char *, const char *);
 
-extern struct user_details user_details; /* XXX */
-
 #ifdef _PATH_SUDO_ASKPASS
 const char *askpass_path = _PATH_SUDO_ASKPASS;
 #else