From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 7 Dec 2017 10:35:26 +0000 (+0100)
Subject: docs-xml: remove deprecated 'use spnego" option
X-Git-Tag: talloc-2.1.11~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb5e19271db1967ed28e08e8969fc438f5942995;p=thirdparty%2Fsamba.git

docs-xml: remove deprecated 'use spnego" option

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/docs-xml/smbdotconf/protocol/usespnego.xml b/docs-xml/smbdotconf/protocol/usespnego.xml
deleted file mode 100644
index 0c9ffbfc6b7..00000000000
--- a/docs-xml/smbdotconf/protocol/usespnego.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<samba:parameter name="use spnego"
-                 context="G"
-                 type="boolean"
-                 deprecated="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-    <para>This deprecated variable controls whether samba will try 
-    to use Simple and Protected NEGOciation (as specified by rfc2478) with 
-    WindowsXP and Windows2000 clients to agree upon an authentication mechanism. 
-</para>
-
-<para>
-    Unless further issues are discovered with our SPNEGO
-    implementation, there is no reason this should ever be
-	disabled.</para>
-</description>
-
-<value type="default">yes</value>
-</samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index ddb45073b1b..3a4a41ae75c 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2749,8 +2749,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 	lpcfg_do_global_parameter(lp_ctx, "client ipc signing", "default");
 	lpcfg_do_global_parameter(lp_ctx, "server signing", "default");
 
-	lpcfg_do_global_parameter(lp_ctx, "use spnego", "True");
-
 	lpcfg_do_global_parameter(lp_ctx, "use mmap", "True");
 
 	lpcfg_do_global_parameter(lp_ctx, "smb ports", "445 139");
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6fa13c136bb..f8f76a66ebc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -830,7 +830,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
 
 	Globals.name_cache_timeout = 660; /* In seconds */
 
-	Globals.use_spnego = true;
 	Globals.client_use_spnego = true;
 
 	Globals.client_signing = SMB_SIGNING_DEFAULT;