param: Remove duplicate initialization of 'share backend' parameter

[mat/samba.git] / lib / param / loadparm.c

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 1048e6939103400cb7f30e44cfce82ae9976f30c..2a251c140d393afcec9caee90c4dcb1f9ef35a1e 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -148,17 +148,18 @@ static const struct enum_list enum_smb_signing_vals[] = {
        {SMB_SIGNING_OFF, "0"},
        {SMB_SIGNING_OFF, "Off"},
        {SMB_SIGNING_OFF, "disabled"},
-       {SMB_SIGNING_SUPPORTED, "Yes"},
-       {SMB_SIGNING_SUPPORTED, "True"},
-       {SMB_SIGNING_SUPPORTED, "1"},
-       {SMB_SIGNING_SUPPORTED, "On"},
-       {SMB_SIGNING_SUPPORTED, "enabled"},
+       {SMB_SIGNING_IF_REQUIRED, "if_required"},
+       {SMB_SIGNING_IF_REQUIRED, "Yes"},
+       {SMB_SIGNING_IF_REQUIRED, "True"},
+       {SMB_SIGNING_IF_REQUIRED, "1"},
+       {SMB_SIGNING_IF_REQUIRED, "On"},
+       {SMB_SIGNING_IF_REQUIRED, "enabled"},
+       {SMB_SIGNING_IF_REQUIRED, "auto"},
        {SMB_SIGNING_REQUIRED, "required"},
        {SMB_SIGNING_REQUIRED, "mandatory"},
        {SMB_SIGNING_REQUIRED, "force"},
        {SMB_SIGNING_REQUIRED, "forced"},
        {SMB_SIGNING_REQUIRED, "enforced"},
-       {SMB_SIGNING_AUTO, "auto"},
        {-1, NULL}
 };
 
@@ -3279,8 +3280,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
        lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
 
-       lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
-
        lpcfg_do_global_parameter(lp_ctx, "server role", "standalone");
 
        /* options that can be set on the command line must be initialised via
@@ -3382,7 +3381,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "idmap trusted only", "False");
 
        lpcfg_do_global_parameter(lp_ctx, "client signing", "default");
-       lpcfg_do_global_parameter(lp_ctx, "server signing", "auto");
+       lpcfg_do_global_parameter(lp_ctx, "server signing", "default");
 
        lpcfg_do_global_parameter(lp_ctx, "use spnego", "True");