summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Samba-Guide/SBE-2000UserNetwork.xml4
-rw-r--r--docs/Samba-Guide/SBE-AddingUNIXClients.xml44
-rw-r--r--docs/Samba-Guide/SBE-MakingHappyUsers.xml15
3 files changed, 19 insertions, 44 deletions
diff --git a/docs/Samba-Guide/SBE-2000UserNetwork.xml b/docs/Samba-Guide/SBE-2000UserNetwork.xml
index 30bbf28fb9..ced9c38625 100644
--- a/docs/Samba-Guide/SBE-2000UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-2000UserNetwork.xml
@@ -61,7 +61,7 @@
<para>
Starting with the configuration files for the server called
- <constant>MASSIVE</constant> in Chapter 6, you now deal with the
+ <constant>MASSIVE</constant> in Chapter 5, you now deal with the
issues that are particular to large distributed networks. Your task
is simple &smbmdash; identify the challenges, consider the
alternatives, and then design and implement a solution.</para>
@@ -1159,7 +1159,7 @@ index default sub
<smbconfoption name="log level">1</smbconfoption>
<smbconfoption name="syslog">0</smbconfoption>
<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
-<smbconfoption name="max log size">0</smbconfoption>
+<smbconfoption name="max log size">50</smbconfoption>
<smbconfoption name="smb ports">139 445</smbconfoption>
<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
<smbconfoption name="time server">Yes</smbconfoption>
diff --git a/docs/Samba-Guide/SBE-AddingUNIXClients.xml b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
index 68d1c10d13..91b7173a51 100644
--- a/docs/Samba-Guide/SBE-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
@@ -471,8 +471,6 @@
</indexterm><indexterm>
<primary>compat</primary>
</indexterm><indexterm>
- <primary>compat</primary>
- </indexterm><indexterm>
<primary>ldap</primary>
</indexterm><indexterm>
<primary>nis</primary>
@@ -801,8 +799,9 @@ ssl no
<example id="ch9-sdmnss">
<title>NSS using LDAP for Identity Resolution &smbmdash; File: <filename>/etc/nsswitch.conf</filename></title>
<screen>
-passwd: compat ldap
-group: compat ldap
+passwd: files ldap
+shadow: files ldap
+group: files ldap
hosts: files dns wins
networks: files dns
@@ -918,7 +917,7 @@ aliases: files
<primary>/etc/nsswitch.conf</primary>
</indexterm>
Edit the <filename>/etc/nsswitch.conf</filename> so it has the entries shown in
- <link linkend="ch9-nsswbnd"/>.
+ <link linkend="ch9-sdmnss"/>.
</para></step>
<step><para><indexterm>
@@ -1064,31 +1063,6 @@ MEGANET2+PIOps:x:10005:
<smbconfoption name="write list">root</smbconfoption>
</smbconfexample>
-<example id="ch9-nsswbnd">
-<title>Name Service Switch Control File: <filename>/etc/nsswitch.conf</filename></title>
-<screen>
-# /etc/nsswitch.conf
-
-passwd: compat winbind
-group: compat winbind
-
-hosts: files dns wins
-networks: files dns
-
-services: files
-protocols: files
-rpc: files
-ethers: files
-netmasks: files
-netgroup: files
-publickey: files
-
-bootparams: files
-automount: files
-aliases: files
-</screen>
-</example>
-
</sect2>
<sect2 id="dcwonss">
@@ -1370,7 +1344,7 @@ massive:/usr/sbin # smbd -b | grep LDAP
</para></step>
<step><para>
- Edit or create the NSS control file so it has the contents shown in <link linkend="ch9-nsswbnd"/>.
+ Edit or create the NSS control file so it has the contents shown in <link linkend="ch9-sdmnss"/>.
</para></step>
<step><para><indexterm>
@@ -1981,10 +1955,11 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash
</para>
<para>
- The following example is for an ADS style domain:
+ The example in <link linkend="sbeunxa"/> is for an ADS style domain.
</para>
- <para>
+<example id="sbeunxa">
+<title>Typical ADS Style Domain &smb.conf; File</title>
<screen>
# Global parameters
[global]
@@ -2003,7 +1978,8 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash
template shell = /bin/bash
winbind use default domain = Yes
</screen>
- </para>
+</example>
+
<para>
<indexterm><primary>realm</primary></indexterm>
In the case of an NT4 or Samba-3 style Domain the <parameter>realm</parameter> is not used and the
diff --git a/docs/Samba-Guide/SBE-MakingHappyUsers.xml b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
index 4b0c75a8bb..6078e1438d 100644
--- a/docs/Samba-Guide/SBE-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
@@ -1561,7 +1561,7 @@ access to dn.base=""
by self write
by * auth
-access to attr=userPassword
+access to attr=userPassword,sambaLMPassword,sambaNTPassword
by self write
by * auth
@@ -2966,7 +2966,7 @@ Joined domain MEGANET2.
Sharename Type Comment
--------- ---- -------
- IPC$ IPC IPC Service (Samba 3.0.1)
+ IPC$ IPC IPC Service (Samba 3.0.15)
accounts Disk Accounting Files
service Disk Financial Services Files
pidata Disk Property Insurance Files
@@ -2974,11 +2974,11 @@ Joined domain MEGANET2.
netlogon Disk Network Logon Service
profiles Disk Profile Share
profdata Disk Profile Data Share
- ADMIN$ IPC IPC Service (Samba 3.0.1)
+ ADMIN$ IPC IPC Service (Samba 3.0.15)
Server Comment
--------- -------
- MASSIVE Samba 3.0.1
+ MASSIVE Samba 3.0.15
Workgroup Master
--------- -------
@@ -3152,12 +3152,12 @@ application/octet-stream
to 1 and back to 5 before the NSS LDAP resolver functions. Follow these
commands:
<screen>
-&rootprompt; init 1
+&rootprompt; telinit 1
</screen>
After the run level has been achieved, you are prompted to provide the
<constant>root</constant> password. Log on, and then execute:
<screen>
-&rootprompt; init 5
+&rootprompt; telinit 5
</screen>
When the normal logon prompt appears, log into the system as
<constant>root</constant>
@@ -3654,8 +3654,7 @@ structuralObjectClass: organizationalUnit
NT/200x/XP client logs onto the network, it tries to obtain the file
<filename>logon.bat</filename>
from the fully qualified path <filename>/var/lib/samba/netlogon/scripts</filename>. This fully
- qualified path should, therefore, exist whether you install the
- <filename>logon.bat</filename>.
+ qualified path should, therefore, exist where you install the <filename>logon.bat</filename>.
</para>
<para>