From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 24 Nov 1999 03:52:34 +0000 (+0000)
Subject: Make the -s flag be exclusive too.  Also reorder the flags in
X-Git-Tag: SUDO_1_6_1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6713b85dc64378d8076de0c84eb126b20d4ae2af;p=sudo

Make the -s flag be exclusive too.  Also reorder the flags in
the exclusive usage message so they are alphabetical.
---

diff --git a/sudo.c b/sudo.c
index f332715ef..7ef1c3d88 100644
--- a/sudo.c
+++ b/sudo.c
@@ -633,6 +633,9 @@ parse_args()
 		break;
 	    case 's':
 		rval |= MODE_SHELL;
+		if (excl && excl != 's')
+		    usage_excl(1);
+		excl = 's';
 		if (def_flag(I_SET_HOME))
 		    rval |= MODE_RESET_HOME;
 		break;
@@ -1043,7 +1046,7 @@ usage_excl(exit_val)
     int exit_val;
 {
     (void) fprintf(stderr,
-	"Only one of the -v, -k, -K, -l, -V and -h options may be used\n");
+	"Only one of the -h, -k, -K, -l, -s, -v or -V options may be used\n");
     usage(exit_val);
 }