From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 27 Aug 1999 15:53:29 +0000 (+0000)
Subject: fix --enable-noargs-shell
X-Git-Tag: SUDO_1_6_0~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79faf00e5d05bf62c473e217b55f765611af6d89;p=sudo

fix --enable-noargs-shell
---

diff --git a/sudo.c b/sudo.c
index a75e0173f..efca1bffa 100644
--- a/sudo.c
+++ b/sudo.c
@@ -232,29 +232,29 @@ main(argc, argv)
     /* Parse our arguments. */
     sudo_mode = parse_args();
 
-    switch (sudo_mode) {
-	case MODE_VERSION:
-	    print_version();
-	    exit(0);
-	    break;
-	case MODE_HELP:
-	    usage(0);
-	    break;
-	case MODE_VALIDATE:
-	    user_cmnd = "validate";
-	    break;
-    	case MODE_KILL:
-    	case MODE_INVALIDATE:
-	    user_cmnd = "kill";
-	    break;
-    	case MODE_SHELL:
-	    user_cmnd = "shell";
-	    break;
-	case MODE_LIST:
-	    user_cmnd = "list";
-	    printmatches = 1;
-	    break;
-    }
+    if (sudo_mode & MODE_SHELL)
+	user_cmnd = "shell";
+    else
+	switch (sudo_mode) {
+	    case MODE_VERSION:
+		print_version();
+		exit(0);
+		break;
+	    case MODE_HELP:
+		usage(0);
+		break;
+	    case MODE_VALIDATE:
+		user_cmnd = "validate";
+		break;
+	    case MODE_KILL:
+	    case MODE_INVALIDATE:
+		user_cmnd = "kill";
+		break;
+	    case MODE_LIST:
+		user_cmnd = "list";
+		printmatches = 1;
+		break;
+	}
 
     /* Must have a command to run... */
     if (user_cmnd == NULL && NewArgc == 0)