| 1 |
jpp |
1.1 |
diff -up sudo-1.8.6p3/plugins/sudoers/def_data.c.nowaitopt sudo-1.8.6p3/plugins/sudoers/def_data.c |
| 2 |
|
|
--- sudo-1.8.6p3/plugins/sudoers/def_data.c.nowaitopt 2012-09-26 14:05:10.088862635 +0200 |
| 3 |
|
|
+++ sudo-1.8.6p3/plugins/sudoers/def_data.c 2012-09-26 13:36:07.750215749 +0200 |
| 4 |
|
|
@@ -351,6 +351,10 @@ struct sudo_defs_types sudo_defs_table[] |
| 5 |
|
|
N_("Set of limit privileges"), |
| 6 |
|
|
NULL, |
| 7 |
|
|
}, { |
| 8 |
|
|
+ "cmnd_no_wait", T_FLAG, |
| 9 |
|
|
+ N_("Don't fork and wait for the command to finish, just exec it"), |
| 10 |
|
|
+ NULL, |
| 11 |
|
|
+ }, { |
| 12 |
|
|
NULL, 0, NULL |
| 13 |
|
|
} |
| 14 |
|
|
}; |
| 15 |
|
|
diff -up sudo-1.8.6p3/plugins/sudoers/def_data.h.nowaitopt sudo-1.8.6p3/plugins/sudoers/def_data.h |
| 16 |
|
|
--- sudo-1.8.6p3/plugins/sudoers/def_data.h.nowaitopt 2012-09-26 14:05:03.280859958 +0200 |
| 17 |
|
|
+++ sudo-1.8.6p3/plugins/sudoers/def_data.h 2012-09-26 13:37:05.320329089 +0200 |
| 18 |
|
|
@@ -162,6 +162,8 @@ |
| 19 |
|
|
#define I_PRIVS 80 |
| 20 |
|
|
#define def_limitprivs (sudo_defs_table[81].sd_un.str) |
| 21 |
|
|
#define I_LIMITPRIVS 81 |
| 22 |
|
|
+#define def_cmnd_no_wait (sudo_defs_table[82].sd_un.flag) |
| 23 |
|
|
+#define I_CMND_NO_WAIT 82 |
| 24 |
|
|
|
| 25 |
|
|
enum def_tuple { |
| 26 |
|
|
never, |
| 27 |
|
|
diff -up sudo-1.8.6p3/plugins/sudoers/sudoers.c.nowaitopt sudo-1.8.6p3/plugins/sudoers/sudoers.c |
| 28 |
|
|
--- sudo-1.8.6p3/plugins/sudoers/sudoers.c.nowaitopt 2012-09-26 14:04:47.223854171 +0200 |
| 29 |
|
|
+++ sudo-1.8.6p3/plugins/sudoers/sudoers.c 2012-09-26 13:39:05.590552887 +0200 |
| 30 |
|
|
@@ -689,6 +689,8 @@ sudoers_policy_main(int argc, char * con |
| 31 |
|
|
command_info[info_len++] = estrdup("set_utmp=true"); |
| 32 |
|
|
if (def_use_pty) |
| 33 |
|
|
command_info[info_len++] = estrdup("use_pty=true"); |
| 34 |
|
|
+ if (def_cmnd_no_wait) |
| 35 |
|
|
+ command_info[info_len++] = estrdup("cmnd_no_wait=true"); |
| 36 |
|
|
if (def_utmp_runas) |
| 37 |
|
|
command_info[info_len++] = fmt_string("utmp_user", runas_pw->pw_name); |
| 38 |
|
|
#ifdef HAVE_LOGIN_CAP_H |
| 39 |
|
|
diff -up sudo-1.8.6p3/src/exec.c.nowaitopt sudo-1.8.6p3/src/exec.c |
| 40 |
|
|
--- sudo-1.8.6p3/src/exec.c.nowaitopt 2012-09-26 14:06:08.505887008 +0200 |
| 41 |
|
|
+++ sudo-1.8.6p3/src/exec.c 2012-09-26 13:29:19.786240447 +0200 |
| 42 |
|
|
@@ -281,6 +281,45 @@ sudo_execute(struct command_details *det |
| 43 |
|
|
} |
| 44 |
|
|
|
| 45 |
|
|
/* |
| 46 |
|
|
+ * If we don't want to wait for the command to exit, then just exec it. |
| 47 |
|
|
+ * THIS WILL BREAK SEVERAL THINGS including SELinux, PAM sessions and I/O |
| 48 |
|
|
+ * logging. Implemented because of rhbz#840980 (backwards compatibility). |
| 49 |
|
|
+ * In 1.8.x branch this is even harder to get back, since the nowait code |
| 50 |
|
|
+ * was completely removed. |
| 51 |
|
|
+ */ |
| 52 |
|
|
+ if (details->flags & CD_DONTWAIT) { |
| 53 |
|
|
+ if (exec_setup(details, NULL, -1) == true) { |
| 54 |
|
|
+ /* headed for execve() */ |
| 55 |
|
|
+ sudo_debug_execve(SUDO_DEBUG_INFO, details->command, |
| 56 |
|
|
+ details->argv, details->envp); |
| 57 |
|
|
+ if (details->closefrom >= 0) { |
| 58 |
|
|
+ int maxfd = details->closefrom; |
| 59 |
|
|
+ dup2(sv[1], maxfd); |
| 60 |
|
|
+ (void)fcntl(maxfd, F_SETFD, FD_CLOEXEC); |
| 61 |
|
|
+ sv[1] = maxfd++; |
| 62 |
|
|
+ if (sudo_debug_fd_set(maxfd) != -1) |
| 63 |
|
|
+ maxfd++; |
| 64 |
|
|
+ closefrom(maxfd); |
| 65 |
|
|
+ } |
| 66 |
|
|
+#ifdef HAVE_SELINUX |
| 67 |
|
|
+ if (ISSET(details->flags, CD_RBAC_ENABLED)) { |
| 68 |
|
|
+ selinux_execve(details->command, details->argv, details->envp, |
| 69 |
|
|
+ ISSET(details->flags, CD_NOEXEC)); |
| 70 |
|
|
+ } else |
| 71 |
|
|
+#endif |
| 72 |
|
|
+ { |
| 73 |
|
|
+ sudo_execve(details->command, details->argv, details->envp, |
| 74 |
|
|
+ ISSET(details->flags, CD_NOEXEC)); |
| 75 |
|
|
+ } |
| 76 |
|
|
+ sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to exec %s: %s", |
| 77 |
|
|
+ details->command, strerror(errno)); |
| 78 |
|
|
+ } |
| 79 |
|
|
+ cstat->type = CMD_ERRNO; |
| 80 |
|
|
+ cstat->val = errno; |
| 81 |
|
|
+ return 127; |
| 82 |
|
|
+ } |
| 83 |
|
|
+ |
| 84 |
|
|
+ /* |
| 85 |
|
|
* We communicate with the child over a bi-directional pair of sockets. |
| 86 |
|
|
* Parent sends signal info to child and child sends back wait status. |
| 87 |
|
|
*/ |
| 88 |
|
|
diff -up sudo-1.8.6p3/src/sudo.c.nowaitopt sudo-1.8.6p3/src/sudo.c |
| 89 |
|
|
--- sudo-1.8.6p3/src/sudo.c.nowaitopt 2012-09-26 14:06:25.504894811 +0200 |
| 90 |
|
|
+++ sudo-1.8.6p3/src/sudo.c 2012-09-26 13:33:34.306889223 +0200 |
| 91 |
|
|
@@ -552,6 +552,11 @@ command_info_to_details(char * const inf |
| 92 |
|
|
} |
| 93 |
|
|
break; |
| 94 |
|
|
} |
| 95 |
|
|
+ if (strncmp("cmnd_no_wait=", info[i], sizeof("cmnd_no_wait=") - 1) == 0) { |
| 96 |
|
|
+ if (atobool(info[i] + sizeof("cmnd_no_wait=") - 1) == true) |
| 97 |
|
|
+ SET(details->flags, CD_DONTWAIT); |
| 98 |
|
|
+ break; |
| 99 |
|
|
+ } |
| 100 |
|
|
break; |
| 101 |
|
|
case 'l': |
| 102 |
|
|
SET_STRING("login_class=", login_class) |
| 103 |
|
|
diff -up sudo-1.8.6p3/src/sudo.h.nowaitopt sudo-1.8.6p3/src/sudo.h |
| 104 |
|
|
--- sudo-1.8.6p3/src/sudo.h.nowaitopt 2012-09-26 14:06:20.856892631 +0200 |
| 105 |
|
|
+++ sudo-1.8.6p3/src/sudo.h 2012-09-26 13:19:11.697482212 +0200 |
| 106 |
|
|
@@ -131,6 +131,7 @@ struct user_details { |
| 107 |
|
|
#define CD_USE_PTY 0x1000 |
| 108 |
|
|
#define CD_SET_UTMP 0x2000 |
| 109 |
|
|
#define CD_SUDOEDIT_COPY 0x4000 |
| 110 |
|
|
+#define CD_DONTWAIT 0x8000 |
| 111 |
|
|
|
| 112 |
|
|
struct command_details { |
| 113 |
|
|
uid_t uid; |
Parent Directory
| 
Revision Log
| 
Revision Graph
