From e88d882fc6447dacb53ed2091e930481e9327f63 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 7 Dec 2004 16:32:50 +0000 Subject: Use \ rather then + as the example winbind separator as + causes problems on systems with NIS (#1092) (This used to be commit e7a338890affed608faca0aa34cc76561db23f67) --- docs/Samba-HOWTO-Collection/FastStart.xml | 19 +++++------ docs/Samba-HOWTO-Collection/IDMAP.xml | 1 - docs/Samba-HOWTO-Collection/PAM.xml | 18 +++++------ docs/Samba-HOWTO-Collection/Winbind.xml | 52 +++++++++++++++---------------- docs/Samba-HOWTO-Collection/index.xml | 3 +- 5 files changed, 44 insertions(+), 49 deletions(-) (limited to 'docs/Samba-HOWTO-Collection') diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml index 1e4c08e20c..c2c11bc447 100644 --- a/docs/Samba-HOWTO-Collection/FastStart.xml +++ b/docs/Samba-HOWTO-Collection/FastStart.xml @@ -660,7 +660,6 @@ smb: \> q show add printer wizardNo idmap uid15000-20000 idmap gid15000-20000 -winbind separator+ winbind use default domainYes use sendfileYes printingcups @@ -749,18 +748,18 @@ hosts: files dns winbind Validate that domain user and group credentials can be correctly resolved by executing: &rootprompt;wbinfo -u -MIDEARTH+maryo -MIDEARTH+jackb -MIDEARTH+ameds +MIDEARTH\maryo +MIDEARTH\jackb +MIDEARTH\ameds ... -MIDEARTH+root +MIDEARTH\root &rootprompt;wbinfo -g -MIDEARTH+Domain Users -MIDEARTH+Domain Admins -MIDEARTH+Domain Guests +MIDEARTH\Domain Users +MIDEARTH\Domain Admins +MIDEARTH\Domain Guests ... -MIDEARTH+Accounts +MIDEARTH\Accounts @@ -1187,7 +1186,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb ldap passwd syncYes idmap uid15000-20000 idmap gid15000-20000 -winbind separator+ printingcups ... @@ -1250,7 +1248,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb ldap passwd syncYes idmap uid15000-20000 idmap gid15000-20000 -winbind separator+ printingcups ... diff --git a/docs/Samba-HOWTO-Collection/IDMAP.xml b/docs/Samba-HOWTO-Collection/IDMAP.xml index 88df84e330..7669c03746 100644 --- a/docs/Samba-HOWTO-Collection/IDMAP.xml +++ b/docs/Samba-HOWTO-Collection/IDMAP.xml @@ -404,7 +404,6 @@ Domain Member Servers (DMSs) and Domain Member Clients (DMCs). idmap gid = 10000-20000 template primary group = "Domain Users" template shell = /bin/bash - winbind separator = + diff --git a/docs/Samba-HOWTO-Collection/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml index 49ff65f25a..d5240f021a 100644 --- a/docs/Samba-HOWTO-Collection/PAM.xml +++ b/docs/Samba-HOWTO-Collection/PAM.xml @@ -874,7 +874,7 @@ password required /lib/security/pam_stack.so service=system-auth When I open a new console with [ctrl][alt][F1], I can't log in with my user pitie. - I have tried with user scienceu+pitie also. + I have tried with user scienceu\pitie also. @@ -903,18 +903,18 @@ password required /lib/security/pam_stack.so service=system-auth &rootprompt;wbinfo -u -MIDEARTH+maryo -MIDEARTH+jackb -MIDEARTH+ameds +MIDEARTH\maryo +MIDEARTH\jackb +MIDEARTH\ameds ... -MIDEARTH+root +MIDEARTH\root &rootprompt;wbinfo -g -MIDEARTH+Domain Users -MIDEARTH+Domain Admins -MIDEARTH+Domain Guests +MIDEARTH\Domain Users +MIDEARTH\Domain Admins +MIDEARTH\Domain Guests ... -MIDEARTH+Accounts +MIDEARTH\Accounts &rootprompt;getent passwd root:x:0:0:root:/root:/bin/bash diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index 8e1862a65e..f531336b43 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -583,8 +583,8 @@ linkend="winbindcfg">the next example, was modified to include the necess smb.conf for Winbind set-up [global] <...> - separate domain and username with '+', like DOMAIN+username -winbind separator+ + separate domain and username with '\', like DOMAIN\username +winbind separator\ use uids from 10000 to 20000 for domain users idmap uid10000-20000 use gids from 10000 to 20000 for domain groups @@ -686,16 +686,16 @@ your PDC. For example, I get the following response: - CEO+Administrator - CEO+burdell - CEO+Guest - CEO+jt-ad - CEO+krbtgt - CEO+TsInternetUser + CEO\Administrator + CEO\burdell + CEO\Guest + CEO\jt-ad + CEO\krbtgt + CEO\TsInternetUser -Obviously, I have named my domain CEO and my winbind separator is +. +Obviously, I have named my domain CEO and my winbind separator is \. @@ -704,15 +704,15 @@ You can do the same sort of thing to get group information from the PDC: &rootprompt;/usr/local/samba/bin/wbinfo -g - CEO+Domain Admins - CEO+Domain Users - CEO+Domain Guests - CEO+Domain Computers - CEO+Domain Controllers - CEO+Cert Publishers - CEO+Schema Admins - CEO+Enterprise Admins - CEO+Group Policy Creator Owners + CEO\Domain Admins + CEO\Domain Users + CEO\Domain Guests + CEO\Domain Computers + CEO\Domain Controllers + CEO\Cert Publishers + CEO\Schema Admins + CEO\Enterprise Admins + CEO\Group Policy Creator Owners @@ -1201,18 +1201,18 @@ cost of running a mixed UNIX and NT network. &rootprompt;wbinfo -u -MIDEARTH+maryo -MIDEARTH+jackb -MIDEARTH+ameds +MIDEARTH\maryo +MIDEARTH\jackb +MIDEARTH\ameds ... -MIDEARTH+root +MIDEARTH\root &rootprompt;wbinfo -g -MIDEARTH+Domain Users -MIDEARTH+Domain Admins -MIDEARTH+Domain Guests +MIDEARTH\Domain Users +MIDEARTH\Domain Admins +MIDEARTH\Domain Guests ... -MIDEARTH+Accounts +MIDEARTH\Accounts &rootprompt;getent passwd root:x:0:0:root:/root:/bin/bash diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml index 0ebb2877f1..10b7a492de 100644 --- a/docs/Samba-HOWTO-Collection/index.xml +++ b/docs/Samba-HOWTO-Collection/index.xml @@ -1,6 +1,5 @@ - %globalentities; ]> -- cgit