summaryrefslogtreecommitdiff
path: root/docs/Samba-Guide
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-05-27 22:29:48 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:40 -0500
commit065a3fdd061caf310729133d5d444e82cadf7f85 (patch)
treeb2f5cb7e1c0699fde680e5e9f3c6a6c7151371f1 /docs/Samba-Guide
parentc25c6614139d3f8a3eba60ae305e75bf03201e53 (diff)
downloadsamba-065a3fdd061caf310729133d5d444e82cadf7f85.tar.gz
samba-065a3fdd061caf310729133d5d444e82cadf7f85.tar.bz2
samba-065a3fdd061caf310729133d5d444e82cadf7f85.zip
Progress update.
(This used to be commit debb0740ff4d9c189589463dcab602830f163eb7)
Diffstat (limited to 'docs/Samba-Guide')
-rw-r--r--docs/Samba-Guide/SBE-AddingUNIXClients.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/Samba-Guide/SBE-AddingUNIXClients.xml b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
index 95625f0a74..d45f8dd6d5 100644
--- a/docs/Samba-Guide/SBE-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
@@ -1174,7 +1174,7 @@ Joined domain MEGANET2.
<indexterm><primary>Active Directory</primary></indexterm>
<indexterm><primary>LDAP</primary></indexterm>
<indexterm><primary>Identity resolution</primary></indexterm>
- <indexterm <primary>Kerberos</primary></indexterm>
+ <indexterm><primary>Kerberos</primary></indexterm>
The diagram in <link linkend="ch9-adsdc"/> demonstrates how Samba-3 interfaces with
Microsoft Active Directory components. It should be noted that if Microsoft Windows Services
for UNIX (SFU) has been installed and correctly configured, it is possible to use client LDAP
@@ -1802,7 +1802,7 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt-
<smbconfoption name="realm">CORP.KPAK.COM</smbconfoption>
<smbconfoption name="server string">Office Server</smbconfoption>
<smbconfoption name="security">ADS</smbconfoption>
-<smbconfoption name="<smbconfoption name="allow trusted domains">No</smbconfoption>
+<smbconfoption name="allow trusted domains">No</smbconfoption>
<smbconfoption name="idmap backend">idmap_rid:KPAK=500-100000000</smbconfoption>
<smbconfoption name="idmap uid">500-100000000</smbconfoption>
<smbconfoption name="idmap gid">500-100000000</smbconfoption>