From 44d7774a1816da7ce02dadc98535fd67a10905ca Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 2 Nov 2011 17:30:34 +0100
Subject: s3:param: the behavior of "client/server signing = auto" is the same
 as "true"

So remove the special case for 'Auto'.

metze
---
 source3/libsmb/clientgen.c | 1 -
 source3/param/loadparm.c   | 4 ++--
 source3/smbd/signing.c     | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 683e60aba1..064be65f82 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -250,7 +250,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 	default:
 	case true:
 	case Undefined:
-	case Auto:
 		allow_smb_signing = true;
 		desire_smb_signing = false;
 		mandatory_signing = false;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 407ef68d4c..1aec709502 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -445,7 +445,7 @@ static const struct enum_list enum_smb_signing_vals[] = {
 	{true, "1"},
 	{true, "On"},
 	{true, "enabled"},
-	{Auto, "auto"},
+	{true, "auto"},
 	{Required, "required"},
 	{Required, "mandatory"},
 	{Required, "force"},
@@ -4978,7 +4978,7 @@ static void init_globals(bool reinit_globals)
 	Globals.bUseSpnego = true;
 	Globals.bClientUseSpnego = true;
 
-	Globals.client_signing = Auto;
+	Globals.client_signing = true;
 	Globals.server_signing = false;
 
 	Globals.bDeferSharingViolations = true;
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 8e08ae9691..9d2e022133 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -164,8 +164,6 @@ bool srv_init_signing(struct smbd_server_connection *conn)
 	case Required:
 		mandatory = true;
 		break;
-	case Auto:
-		break;
 	case True:
 		break;
 	case False:
-- 
cgit