From: Andreas Schneider <asn@samba.org>
Date: Wed, 13 Jan 2021 08:27:07 +0000 (+0100)
Subject: s3:utils: Remove duplicate '-R' option from nmblookup
X-Git-Tag: tevent-0.11.0~761
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60427f5191e8cb8e8dc9a5454ee5bfb523d4731d;p=thirdparty%2Fsamba.git

s3:utils: Remove duplicate '-R' option from nmblookup

-R is already use for 'name-resolve'. The long option --recursive is
still working and available.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index f718e47a98f..325608d75e7 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -227,6 +227,10 @@ static bool query_one(const char *lookup, unsigned int lookup_type)
 /****************************************************************************
   main program
 ****************************************************************************/
+enum nmblookup_cmdline_options {
+	CMDLINE_RECURSIVE = 1,
+};
+
 int main(int argc, const char *argv[])
 {
 	int opt;
@@ -275,10 +279,10 @@ int main(int argc, const char *argv[])
 		},
 		{
 			.longName   = "recursion",
-			.shortName  = 'R',
+			.shortName  = 0,
 			.argInfo    = POPT_ARG_NONE,
 			.arg        = NULL,
-			.val        = 'R',
+			.val        = CMDLINE_RECURSIVE,
 			.descrip    = "Set recursion desired in package",
 		},
 		{
@@ -337,7 +341,7 @@ int main(int argc, const char *argv[])
 		case 'M':
 			find_master = true;
 			break;
-		case 'R':
+		case CMDLINE_RECURSIVE:
 			recursion_desired = true;
 			break;
 		case 'S':