Imported Upstream version 1.8.7

[debian/sudo] / src / sesh.c

diff --git a/src/sesh.c b/src/sesh.c
index e0aef78f8e1d8a11e79fb3f7f4ed3e0bdaca49f4..1a1b999a4a5179c130feb316b8c421aa662c2546 100644 (file)
--- a/src/sesh.c
+++ b/src/sesh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2008, 2010-2013 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,38 +19,63 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <err.h>
-#include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# include "compat/stdbool.h"
+#endif /* HAVE_STDBOOL_H */
 
 #include "missing.h"
+#include "alloc.h"
+#include "error.h"
+#include "gettext.h"
+#include "sudo_conf.h"
+#include "sudo_debug.h"
+#include "sudo_exec.h"
+#include "sudo_plugin.h"
+
+__dso_public int main(int argc, char *argv[], char *envp[]);
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[], char *envp[])
 {
     char *cp, *cmnd;
+    int noexec = 0;
+    debug_decl(main, SUDO_DEBUG_MAIN)
+
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+    textdomain(PACKAGE_NAME);
 
     if (argc < 2)
-       errx(EXIT_FAILURE, "requires at least one argument");
+       fatalx(_("requires at least one argument"));
+
+    /* Read sudo.conf. */
+    sudo_conf_read(NULL);
+
+    /* If argv[0] ends in -noexec, pass the flag to sudo_execve() */
+    if ((cp = strrchr(argv[0], '-')) != NULL && cp != argv[0])
+       noexec = strcmp(cp, "-noexec") == 0;
 
     /* Shift argv and make a copy of the command to execute. */
     argv++;
     argc--;
-    cmnd = strdup(argv[0]);
-    if (cmnd == NULL)
-       err(EXIT_FAILURE, NULL);
+    cmnd = estrdup(argv[0]);
 
     /* If invoked as a login shell, modify argv[0] accordingly. */
-    if (argv[0][0] == '-') {
+    if (argv[-1][0] == '-') {
        if ((cp = strrchr(argv[0], '/')) == NULL)
            cp = argv[0];
        *cp = '-';
     }
-    execv(cmnd, argv);
-    warn("unable to execute %s", argv[0]);
+    sudo_execve(cmnd, argv, envp, noexec);
+    warning(_("unable to execute %s"), argv[0]);
+    sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, EXIT_FAILURE);                
     _exit(EXIT_FAILURE);
 }