From: Andreas Schneider <asn@samba.org>
Date: Wed, 9 Oct 2019 07:47:59 +0000 (+0200)
Subject: s3:lib: Use smb_signing_setting_translate for cmdline parsing
X-Git-Tag: talloc-2.3.2~806
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0ae876a6c8733441a9ea806458eadfb3d695a78;p=thirdparty%2Fsamba.git

s3:lib: Use smb_signing_setting_translate for cmdline parsing

The function will be removed soon.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/lib/util_cmdline.c b/source3/lib/util_cmdline.c
index 90ee67c4cb7..bc1f1c3ed25 100644
--- a/source3/lib/util_cmdline.c
+++ b/source3/lib/util_cmdline.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/samr.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
+#include "libcli/smb/smb_util.h"
 
 /**************************************************************************n
   Code to cope with username/password auth options from the commandline.
@@ -240,20 +241,8 @@ void set_cmdline_auth_info_password(struct user_auth_info *auth_info,
 bool set_cmdline_auth_info_signing_state(struct user_auth_info *auth_info,
 					 const char *arg)
 {
-	auth_info->signing_state = SMB_SIGNING_DEFAULT;
-	if (strequal(arg, "off") || strequal(arg, "no") ||
-			strequal(arg, "false")) {
-		auth_info->signing_state = SMB_SIGNING_OFF;
-	} else if (strequal(arg, "on") || strequal(arg, "yes") ||
-			strequal(arg, "if_required") ||
-			strequal(arg, "true") || strequal(arg, "auto")) {
-		auth_info->signing_state = SMB_SIGNING_IF_REQUIRED;
-	} else if (strequal(arg, "force") || strequal(arg, "required") ||
-			strequal(arg, "forced")) {
-		auth_info->signing_state = SMB_SIGNING_REQUIRED;
-	} else {
-		return false;
-	}
+	auth_info->signing_state = smb_signing_setting_translate(arg);
+
 	return true;
 }
 
diff --git a/source3/wscript_build b/source3/wscript_build
index cf2dd1a4120..95a54db5ab2 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -279,7 +279,7 @@ bld.SAMBA3_LIBRARY('popt_samba3_cmdline',
 
 bld.SAMBA3_LIBRARY('util_cmdline',
                    source='lib/util_cmdline.c',
-                   deps='secrets3 samba-credentials',
+                   deps='secrets3 samba-credentials cli_smb_common',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cmdline_contexts',