s3:lib: Use smb_signing_setting_translate for cmdline parsing
authorAndreas Schneider <asn@samba.org>
Wed, 9 Oct 2019 07:47:59 +0000 (09:47 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 19 Aug 2020 16:22:40 +0000 (16:22 +0000)
The function will be removed soon.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/lib/util_cmdline.c
source3/wscript_build

index 90ee67c4cb7663e1a5f28f16092ebebbd4a7fd1e..bc1f1c3ed25e8ab30c46fdc5b6963dbe79ba592f 100644 (file)
@@ -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;
 }
 
index cf2dd1a4120ff072e946d15dfe1f82a4ef6b2d29..95a54db5ab24e1ecbcee1a6f8dcd380ee7a0838d 100644 (file)
@@ -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',