summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-03-16 20:24:47 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:22 -0500
commitf87f8fee8f933c4a4f0f2b7e5f2123749f70eaf8 (patch)
tree1c8da01aaaae93628295143de72b9387a0d9df0c
parent2b1f630d8cbd3a67edd6ac1f269647f55d0b14a8 (diff)
downloadsamba-f87f8fee8f933c4a4f0f2b7e5f2123749f70eaf8.tar.gz
samba-f87f8fee8f933c4a4f0f2b7e5f2123749f70eaf8.tar.bz2
samba-f87f8fee8f933c4a4f0f2b7e5f2123749f70eaf8.zip
More review needed - this fixes a big glitch.
(This used to be commit 99afc61268551ab19e6bfe90ea88ef969fc85223)
-rw-r--r--docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
index fc2652e8eb..883a2447a6 100644
--- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
@@ -862,17 +862,18 @@ usersdn="ou=People,${suffix}"
# Where are stored Computers
# Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-computersdn="ou=Computers,${suffix}"
+computersdn="ou=People,${suffix}"
# Where are stored Groups
# Ex groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
groupsdn="ou=Groups,${suffix}"
+
# Where are stored Idmap entries (used if samba is a domain member server)
# Ex groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
-idmapdn="ou=People,${suffix}"
+idmapdn="ou=Idmap,${suffix}"
# Where to store next uidNumber and gidNumber available
-sambaUnixIdPooldn="ou=People,${suffix}"
+sambaUnixIdPooldn="sambaDomainName=MEGANET2,dc=abmas,dc=biz"
# Default scope Used
scope="sub"
@@ -883,7 +884,7 @@ scope="sub"
<title>Idealx smbldap-tools Control File &smbmdash; Part C</title>
<screen>
# Unix password encryption (CRYPT, MD5, SMD5, SSHA, SHA)
-hash_encrypt="SSHA"
+hash_encrypt="MD5"
# if hash_encrypt is set to CRYPT, you may set a salt format.
# default is "%s", but many systems will generate MD5 hashed