From: Andreas Schneider <asn@samba.org>
Date: Mon, 9 Nov 2020 15:05:38 +0000 (+0100)
Subject: s3:client: Remove duplicate name-resolv (R) options
X-Git-Tag: tevent-0.11.0~797
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64b8a3abeeb7b5c2069eada23224a7913cefc498;p=thirdparty%2Fsamba.git

s3:client: Remove duplicate name-resolv (R) options

Detected by samba_popt_get_context(), see next commit.

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

diff --git a/source3/client/client.c b/source3/client/client.c
index 148a6036f3c..0da64cbdbd8 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -6288,15 +6288,6 @@ int main(int argc,char *argv[])
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 
-		{
-			.longName   = "name-resolve",
-			.shortName  = 'R',
-			.argInfo    = POPT_ARG_STRING,
-			.arg        = &new_name_resolve_order,
-			.val        = 'R',
-			.descrip    = "Use these name resolution services only",
-			.argDescrip = "NAME-RESOLVE-ORDER",
-		},
 		{
 			.longName   = "message",
 			.shortName  = 'M',