]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:utils: Remove duplicate '-R' option from nmblookup
authorAndreas Schneider <asn@samba.org>
Wed, 13 Jan 2021 08:27:07 +0000 (09:27 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 25 May 2021 00:23:37 +0000 (00:23 +0000)
-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>
source3/utils/nmblookup.c

index f718e47a98fb40ebc69887edd84638e71726ea41..325608d75e7ee7a607068569912422ae91074136 100644 (file)
@@ -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':