From c4659908abf01941148682eaa55b01cfa8c3f290 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 7 Dec 2017 11:10:42 +0100 Subject: [PATCH] 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 Reviewed-by: Ralph Boehme --- docs-xml/manpages/idmap_nss.8.xml | 3 +-- .../winbind/winbindtrusteddomainsonly.xml | 22 ------------------- source3/param/loadparm.c | 1 - 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml diff --git a/docs-xml/manpages/idmap_nss.8.xml b/docs-xml/manpages/idmap_nss.8.xml index b7c5977b757..fa8a2080bfc 100644 --- a/docs-xml/manpages/idmap_nss.8.xml +++ b/docs-xml/manpages/idmap_nss.8.xml @@ -20,8 +20,7 @@ DESCRIPTION The idmap_nss plugin provides a means to map Unix users and groups - to Windows accounts and obsoletes the "winbind trusted domains only" - 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 index 3d420c7ecee..00000000000 --- a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 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 DOMAIN\user1 would be mapped to - the account user1 in /etc/passwd instead of allocating a new uid for him or her. - - - - This parameter is now deprecated in favor of the newer idmap_nss backend. - Refer to the idmap_nss - 8 man page for more information. - - - -no - diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a2fcc4246c9..6fa13c136bb 100644 --- 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); -- 2.34.1