docs-xml: remove deprecated of 'winbind trusted domains only' option

This parameter is already deprecated in favor of the newer idmap_nss backend.

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

diff --git a/docs-xml/manpages/idmap_nss.8.xml b/docs-xml/manpages/idmap_nss.8.xml
index b7c5977b7579fd4d1fc81059fcf5cd2f772ab3df..fa8a2080bfc5425e372ba4d23d6277a8bfe74495 100644 (file)
--- a/docs-xml/manpages/idmap_nss.8.xml
+++ b/docs-xml/manpages/idmap_nss.8.xml
@@ -20,8 +20,7 @@
        <title>DESCRIPTION</title>
 
        <para>The idmap_nss plugin provides a means to map Unix users and groups
-       to Windows accounts and obsoletes the &quot;winbind trusted domains only&quot;
-       smb.conf option.  This provides a simple means of ensuring that the SID
+       to Windows accounts. This provides a simple means of ensuring that the SID
        for a Unix user named jsmith is reported as the one assigned to
        DOMAIN\jsmith which is necessary for reporting ACLs on files and printers
        stored on a Samba member server.

diff --git a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
deleted file mode 100644 (file)
index 3d420c7..0000000
--- a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<samba:parameter name="winbind trusted domains only"
-                 context="G"
-                 type="boolean"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-       <para>
-       This parameter is designed to allow Samba servers that are members 
-       of a Samba controlled domain to use UNIX accounts distributed via NIS, 
-       rsync, or LDAP as the uid's for winbindd users in the hosts primary domain.
-       Therefore, the user <literal>DOMAIN\user1</literal> would be mapped to 
-       the account user1 in /etc/passwd instead of allocating a new uid for him or her.
-       </para>
-
-       <para>
-       This parameter is now deprecated in favor of the newer idmap_nss backend.
-       Refer to the <citerefentry><refentrytitle>idmap_nss</refentrytitle>
-       <manvolnum>8</manvolnum></citerefentry> man page for more information.
-       </para>
-</description>
-
-<value type="default">no</value>
-</samba:parameter>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a2fcc4246c96260d4fc580a57936553051b79169..6fa13c136bbb753935a034b650ee58ec947ea2d0 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -817,7 +817,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.winbind_enum_users = false;
        Globals.winbind_enum_groups = false;
        Globals.winbind_use_default_domain = false;
-       Globals.winbind_trusted_domains_only = false;
        Globals.winbind_nested_groups = true;
        Globals.winbind_expand_groups = 0;
        Globals.winbind_nss_info = str_list_make_v3_const(NULL, "template", NULL);