smbdotconf: finally remove unused "client use spnego principal" option

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
deleted file mode 100644 (file)
index 8e9edd2..0000000
--- a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<samba:parameter name="client use spnego principal"
-                 context="G"
-                 type="boolean"
-                 deprecated="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-    <para>This parameter determines whether or not
-    <citerefentry><refentrytitle>smbclient</refentrytitle>
-    <manvolnum>8</manvolnum></citerefentry> and other samba components
-    acting as a client will attempt to use the server-supplied
-    principal sometimes given in the SPNEGO exchange.</para>
-
-    <para>If enabled, Samba can attempt to use Kerberos to contact
-    servers known only by IP address.  Kerberos relies on names, so
-    ordinarily cannot function in this situation. </para>
-
-    <para>This is a VERY BAD IDEA for security reasons, and so this
-    parameter SHOULD NOT BE USED. It will be removed in a future
-    version of Samba.</para>
-
-    <para>If disabled, Samba will use the name used to look up the
-    server when asking the KDC for a ticket.  This avoids situations
-    where a server may impersonate another, soliciting authentication
-    as one principal while being known on the network as another.
-    </para>
-
-    <para>Note that Windows XP SP2 and later versions already follow
-    this behaviour, and Windows Vista and later servers no longer
-    supply this 'rfc4178 hint' principal on the server side.</para>
-
-    <para>This parameter is deprecated in Samba 4.2.1 and will be removed
-    (along with the functionality) in a later release of Samba.</para>
-</description>
-<value type="default">no</value>
-</samba:parameter>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 0984ca7195b349a30c328dc3ef0bcc1a1dd1a434..f779affe54a0258698a886571d8257e669ca14aa 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2796,7 +2796,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "NTLMAuth", "ntlmv2-only");
        lpcfg_do_global_parameter(lp_ctx, "NT hash store", "always");
        lpcfg_do_global_parameter(lp_ctx, "RawNTLMv2Auth", "False");
-       lpcfg_do_global_parameter(lp_ctx, "client use spnego principal", "False");
 
        lpcfg_do_global_parameter(lp_ctx, "allow dcerpc auth level connect", "False");