summaryrefslogtreecommitdiffstats
path: root/docs/htmldocs
diff options
context:
space:
mode:
Diffstat (limited to 'docs/htmldocs')
-rw-r--r--docs/htmldocs/DOMAIN_MEMBER.html29
-rw-r--r--docs/htmldocs/PAM-Authentication-And-Samba.html29
-rw-r--r--docs/htmldocs/Samba-HOWTO-Collection.html383
-rw-r--r--docs/htmldocs/nmbd.8.html23
-rw-r--r--docs/htmldocs/samba-pdc-faq.html122
-rw-r--r--docs/htmldocs/smb.conf.5.html821
-rw-r--r--docs/htmldocs/smbd.8.html47
-rw-r--r--docs/htmldocs/smbpasswd.8.html55
-rw-r--r--docs/htmldocs/smbrun.1.html215
-rw-r--r--docs/htmldocs/using_samba/licenseinfo.html12
-rw-r--r--docs/htmldocs/using_samba/this_edition.html4
11 files changed, 1161 insertions, 579 deletions
diff --git a/docs/htmldocs/DOMAIN_MEMBER.html b/docs/htmldocs/DOMAIN_MEMBER.html
index bb29c416eb4..b7ef4c9a61b 100644
--- a/docs/htmldocs/DOMAIN_MEMBER.html
+++ b/docs/htmldocs/DOMAIN_MEMBER.html
@@ -32,17 +32,7 @@ NAME="AEN3"
>Joining an NT Domain with Samba 2.2</A
></H1
><P
->In order for a Samba-2 server to join an NT domain,
- you must first add the NetBIOS name of the Samba server to the
- NT domain on the PDC using Server Manager for Domains. This creates
- the machine account in the domain (PDC) SAM. Note that you should
- add the Samba server as a "Windows NT Workstation or Server",
- <I
-CLASS="EMPHASIS"
->NOT</I
-> as a Primary or backup domain controller.</P
-><P
->Assume you have a Samba-2 server with a NetBIOS name of
+>Assume you have a Samba 2.x server with a NetBIOS name of
<TT
CLASS="CONSTANT"
>SERV1</TT
@@ -74,13 +64,26 @@ CLASS="PROMPT"
CLASS="USERINPUT"
><B
>smbpasswd -j DOM -r DOMPDC
- </B
+ -U<TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+></B
></TT
></P
><P
>as we are joining the domain DOM and the PDC for that domain
(the only machine that has write access to the domain SAM database)
- is DOMPDC. If this is successful you will see the message:</P
+ is DOMPDC. The <TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+> is
+ the login name and password for an account which has the necessary
+ privilege to add machines to the domain. If this is successful
+ you will see the message:</P
><P
><TT
CLASS="COMPUTEROUTPUT"
diff --git a/docs/htmldocs/PAM-Authentication-And-Samba.html b/docs/htmldocs/PAM-Authentication-And-Samba.html
index 332a8a73499..6dc815b87bf 100644
--- a/docs/htmldocs/PAM-Authentication-And-Samba.html
+++ b/docs/htmldocs/PAM-Authentication-And-Samba.html
@@ -157,15 +157,24 @@ Samba implementation for your Unix/Linux system. The
CLASS="FILENAME"
>pam_smbpass.so</TT
> module is provided by
-Samba version 2.2.1 or later. It can be compiled only if the
-<TT
-CLASS="CONSTANT"
->--with-pam --with-pam_smbpass</TT
-> options are both
-provided to the Samba <B
+Samba version 2.2.1 or later. It can be compiled by specifying the
+<B
CLASS="COMMAND"
->configure</B
-> program.</P
+>--with-pam_smbpass</B
+> options when running Samba's
+<TT
+CLASS="FILENAME"
+>configure</TT
+> script. For more information
+on the <TT
+CLASS="FILENAME"
+>pam_smbpass</TT
+> module, see the documentation
+in the <TT
+CLASS="FILENAME"
+>source/pam_smbpass</TT
+> directory of the Samba
+source distribution.</P
><P
><PRE
CLASS="PROGRAMLISTING"
@@ -235,7 +244,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN45"
+NAME="AEN47"
>Distributed Authentication</A
></H1
><P
@@ -268,7 +277,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN52"
+NAME="AEN54"
>PAM Configuration in smb.conf</A
></H1
><P
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index c4e4b2c74b5..988766d5340 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -336,12 +336,12 @@ HREF="#AEN455"
></DT
><DT
>3.2. <A
-HREF="#AEN497"
+HREF="#AEN499"
>Distributed Authentication</A
></DT
><DT
>3.3. <A
-HREF="#AEN504"
+HREF="#AEN506"
>PAM Configuration in smb.conf</A
></DT
></DL
@@ -355,14 +355,14 @@ HREF="#MSDFS"
><DL
><DT
>4.1. <A
-HREF="#AEN524"
+HREF="#AEN526"
>Instructions</A
></DT
><DD
><DL
><DT
>4.1.1. <A
-HREF="#AEN559"
+HREF="#AEN561"
>Notes</A
></DT
></DL
@@ -378,53 +378,53 @@ HREF="#UNIX-PERMISSIONS"
><DL
><DT
>5.1. <A
-HREF="#AEN579"
+HREF="#AEN581"
>Viewing and changing UNIX permissions using the NT
security dialogs</A
></DT
><DT
>5.2. <A
-HREF="#AEN588"
+HREF="#AEN590"
>How to view file security on a Samba share</A
></DT
><DT
>5.3. <A
-HREF="#AEN599"
+HREF="#AEN601"
>Viewing file ownership</A
></DT
><DT
>5.4. <A
-HREF="#AEN619"
+HREF="#AEN621"
>Viewing file or directory permissions</A
></DT
><DD
><DL
><DT
>5.4.1. <A
-HREF="#AEN634"
+HREF="#AEN636"
>File Permissions</A
></DT
><DT
>5.4.2. <A
-HREF="#AEN648"
+HREF="#AEN650"
>Directory Permissions</A
></DT
></DL
></DD
><DT
>5.5. <A
-HREF="#AEN655"
+HREF="#AEN657"
>Modifying file or directory permissions</A
></DT
><DT
>5.6. <A
-HREF="#AEN677"
+HREF="#AEN679"
>Interaction with the standard Samba create mask
parameters</A
></DT
><DT
>5.7. <A
-HREF="#AEN741"
+HREF="#AEN743"
>Interaction with the standard Samba file attribute
mapping</A
></DT
@@ -439,75 +439,75 @@ HREF="#PRINTING"
><DL
><DT
>6.1. <A
-HREF="#AEN762"
+HREF="#AEN764"
>Introduction</A
></DT
><DT
>6.2. <A
-HREF="#AEN784"
+HREF="#AEN786"
>Configuration</A
></DT
><DD
><DL
><DT
>6.2.1. <A
-HREF="#AEN795"
+HREF="#AEN797"
>Creating [print$]</A
></DT
><DT
>6.2.2. <A
-HREF="#AEN830"
+HREF="#AEN832"
>Setting Drivers for Existing Printers</A
></DT
><DT
>6.2.3. <A
-HREF="#AEN847"
+HREF="#AEN849"
>Support a large number of printers</A
></DT
><DT
>6.2.4. <A
-HREF="#AEN858"
+HREF="#AEN860"
>Adding New Printers via the Windows NT APW</A
></DT
><DT
>6.2.5. <A
-HREF="#AEN883"
+HREF="#AEN885"
>Samba and Printer Ports</A
></DT
></DL
></DD
><DT
>6.3. <A
-HREF="#AEN891"
+HREF="#AEN893"
>The Imprints Toolset</A
></DT
><DD
><DL
><DT
>6.3.1. <A
-HREF="#AEN895"
+HREF="#AEN897"
>What is Imprints?</A
></DT
><DT
>6.3.2. <A
-HREF="#AEN905"
+HREF="#AEN907"
>Creating Printer Driver Packages</A
></DT
><DT
>6.3.3. <A
-HREF="#AEN908"
+HREF="#AEN910"
>The Imprints server</A
></DT
><DT
>6.3.4. <A
-HREF="#AEN912"
+HREF="#AEN914"
>The Installation Client</A
></DT
></DL
></DD
><DT
>6.4. <A
-HREF="#AEN934"
+HREF="#AEN936"
><A
NAME="MIGRATION"
></A
@@ -524,17 +524,17 @@ HREF="#DOMAIN-SECURITY"
><DL
><DT
>7.1. <A
-HREF="#AEN988"
+HREF="#AEN990"
>Joining an NT Domain with Samba 2.2</A
></DT
><DT
>7.2. <A
-HREF="#AEN1052"
+HREF="#AEN1054"
>Samba and Windows 2000 Domains</A
></DT
><DT
>7.3. <A
-HREF="#AEN1057"
+HREF="#AEN1059"
>Why is this better than security = server?</A
></DT
></DL
@@ -548,22 +548,22 @@ HREF="#SAMBA-PDC"
><DL
><DT
>8.1. <A
-HREF="#AEN1090"
+HREF="#AEN1092"
>Prerequisite Reading</A
></DT
><DT
>8.2. <A
-HREF="#AEN1096"
+HREF="#AEN1098"
>Background</A
></DT
><DT
>8.3. <A
-HREF="#AEN1138"
+HREF="#AEN1140"
>Configuring the Samba Domain Controller</A
></DT
><DT
>8.4. <A
-HREF="#AEN1180"
+HREF="#AEN1182"
>Creating Machine Trust Accounts and Joining Clients
to the Domain</A
></DT
@@ -571,83 +571,83 @@ to the Domain</A
><DL
><DT
>8.4.1. <A
-HREF="#AEN1194"
+HREF="#AEN1196"
>Manually creating machine trust accounts</A
></DT
><DT
>8.4.2. <A
-HREF="#AEN1225"
+HREF="#AEN1227"
>Creating machine trust accounts "on the fly"</A
></DT
></DL
></DD
><DT
>8.5. <A
-HREF="#AEN1236"
+HREF="#AEN1238"
>Common Problems and Errors</A
></DT
><DT
>8.6. <A
-HREF="#AEN1284"
+HREF="#AEN1286"
>System Policies and Profiles</A
></DT
><DT
>8.7. <A
-HREF="#AEN1328"
+HREF="#AEN1330"
>What other help can I get ?</A
></DT
><DT
>8.8. <A
-HREF="#AEN1442"
+HREF="#AEN1444"
>Domain Control for Windows 9x/ME</A
></DT
><DD
><DL
><DT
>8.8.1. <A
-HREF="#AEN1472"
+HREF="#AEN1474"
>Configuration Instructions: Network Logons</A
></DT
><DT
>8.8.2. <A
-HREF="#AEN1506"
+HREF="#AEN1508"
>Configuration Instructions: Setting up Roaming User Profiles</A
></DT
><DD
><DL
><DT
>8.8.2.1. <A
-HREF="#AEN1514"
+HREF="#AEN1516"
>Windows NT Configuration</A
></DT
><DT
>8.8.2.2. <A
-HREF="#AEN1522"
+HREF="#AEN1524"
>Windows 9X Configuration</A
></DT
><DT
>8.8.2.3. <A
-HREF="#AEN1530"
+HREF="#AEN1532"
>Win9X and WinNT Configuration</A
></DT
><DT
>8.8.2.4. <A
-HREF="#AEN1537"
+HREF="#AEN1539"
>Windows 9X Profile Setup</A
></DT
><DT
>8.8.2.5. <A
-HREF="#AEN1573"
+HREF="#AEN1575"
>Windows NT Workstation 4.0</A
></DT
><DT
>8.8.2.6. <A
-HREF="#AEN1586"
+HREF="#AEN1588"
>Windows NT Server</A
></DT
><DT
>8.8.2.7. <A
-HREF="#AEN1589"
+HREF="#AEN1591"
>Sharing Profiles between W95 and NT Workstation 4.0</A
></DT
></DL
@@ -656,7 +656,7 @@ HREF="#AEN1589"
></DD
><DT
>8.9. <A
-HREF="#AEN1599"
+HREF="#AEN1601"
>DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
></DT
></DL
@@ -670,119 +670,119 @@ HREF="#WINBIND"
><DL
><DT
>9.1. <A
-HREF="#AEN1642"
+HREF="#AEN1644"
>Abstract</A
></DT
><DT
>9.2. <A
-HREF="#AEN1646"
+HREF="#AEN1648"
>Introduction</A
></DT
><DT
>9.3. <A
-HREF="#AEN1659"
+HREF="#AEN1661"
>What Winbind Provides</A
></DT
><DD
><DL
><DT
>9.3.1. <A
-HREF="#AEN1666"
+HREF="#AEN1668"
>Target Uses</A
></DT
></DL
></DD
><DT
>9.4. <A
-HREF="#AEN1670"
+HREF="#AEN1672"
>How Winbind Works</A
></DT
><DD
><DL
><DT
>9.4.1. <A
-HREF="#AEN1675"
+HREF="#AEN1677"
>Microsoft Remote Procedure Calls</A
></DT
><DT
>9.4.2. <A
-HREF="#AEN1679"
+HREF="#AEN1681"
>Name Service Switch</A
></DT
><DT
>9.4.3. <A
-HREF="#AEN1695"
+HREF="#AEN1697"
>Pluggable Authentication Modules</A
></DT
><DT
>9.4.4. <A
-HREF="#AEN1703"
+HREF="#AEN1705"
>User and Group ID Allocation</A
></DT
><DT
>9.4.5. <A
-HREF="#AEN1707"
+HREF="#AEN1709"
>Result Caching</A
></DT
></DL
></DD
><DT
>9.5. <A
-HREF="#AEN1710"
+HREF="#AEN1712"
>Installation and Configuration</A
></DT
><DD
><DL
><DT
>9.5.1. <A
-HREF="#AEN1715"
+HREF="#AEN1717"
>Introduction</A
></DT
><DT
>9.5.2. <A
-HREF="#AEN1728"
+HREF="#AEN1730"
>Requirements</A
></DT
><DT
>9.5.3. <A
-HREF="#AEN1736"
+HREF="#AEN1738"
>Testing Things Out</A
></DT
><DD
><DL
><DT
>9.5.3.1. <A
-HREF="#AEN1745"
+HREF="#AEN1747"
>Configure and compile SAMBA</A
></DT
><DT
>9.5.3.2. <A
-HREF="#AEN1757"
+HREF="#AEN1759"
>Configure nsswitch.conf and the winbind libraries</A
></DT
><DT
>9.5.3.3. <A
-HREF="#AEN1776"
+HREF="#AEN1778"
>Configure smb.conf</A
></DT
><DT
>9.5.3.4. <A
-HREF="#AEN1785"
+HREF="#AEN1787"
>Join the SAMBA server to the PDC domain</A
></DT
><DT
>9.5.3.5. <A
-HREF="#AEN1795"
+HREF="#AEN1797"
>Start up the winbindd daemon and test it!</A
></DT
><DT
>9.5.3.6. <A
-HREF="#AEN1822"
+HREF="#AEN1824"
>Fix the /etc/rc.d/init.d/smb startup files</A
></DT
><DT
>9.5.3.7. <A
-HREF="#AEN1839"
+HREF="#AEN1841"
>Configure Winbind and PAM</A
></DT
></DL
@@ -791,12 +791,12 @@ HREF="#AEN1839"
></DD
><DT
>9.6. <A
-HREF="#AEN1880"
+HREF="#AEN1882"
>Limitations</A
></DT
><DT
>9.7. <A
-HREF="#AEN1890"
+HREF="#AEN1892"
>Conclusion</A
></DT
></DL
@@ -810,32 +810,32 @@ HREF="#OS2"
><DL
><DT
>10.1. <A
-HREF="#AEN1904"
+HREF="#AEN1906"
>FAQs</A
></DT
><DD
><DL
><DT
>10.1.1. <A
-HREF="#AEN1906"
+HREF="#AEN1908"
>How can I configure OS/2 Warp Connect or
OS/2 Warp 4 as a client for Samba?</A
></DT
><DT
>10.1.2. <A
-HREF="#AEN1921"
+HREF="#AEN1923"
>How can I configure OS/2 Warp 3 (not Connect),
OS/2 1.2, 1.3 or 2.x for Samba?</A
></DT
><DT
>10.1.3. <A
-HREF="#AEN1930"
+HREF="#AEN1932"
>Are there any other issues when OS/2 (any version)
is used as a client?</A
></DT
><DT
>10.1.4. <A
-HREF="#AEN1934"
+HREF="#AEN1936"
>How do I get printer driver download working
for OS/2 clients?</A
></DT
@@ -852,24 +852,24 @@ HREF="#CVS-ACCESS"
><DL
><DT
>11.1. <A
-HREF="#AEN1950"
+HREF="#AEN1952"
>Introduction</A
></DT
><DT
>11.2. <A
-HREF="#AEN1955"
+HREF="#AEN1957"
>CVS Access to samba.org</A
></DT
><DD
><DL
><DT
>11.2.1. <A
-HREF="#AEN1958"
+HREF="#AEN1960"
>Access via CVSweb</A
></DT
><DT
>11.2.2. <A
-HREF="#AEN1963"
+HREF="#AEN1965"
>Access via cvs</A
></DT
></DL
@@ -878,7 +878,7 @@ HREF="#AEN1963"
></DD
><DT
><A
-HREF="#AEN1991"
+HREF="#AEN1993"
>Index</A
></DT
></DL
@@ -3034,15 +3034,24 @@ Samba implementation for your Unix/Linux system. The
CLASS="FILENAME"
>pam_smbpass.so</TT
> module is provided by
-Samba version 2.2.1 or later. It can be compiled only if the
-<TT
-CLASS="CONSTANT"
->--with-pam --with-pam_smbpass</TT
-> options are both
-provided to the Samba <B
+Samba version 2.2.1 or later. It can be compiled by specifying the
+<B
CLASS="COMMAND"
->configure</B
-> program.</P
+>--with-pam_smbpass</B
+> options when running Samba's
+<TT
+CLASS="FILENAME"
+>configure</TT
+> script. For more information
+on the <TT
+CLASS="FILENAME"
+>pam_smbpass</TT
+> module, see the documentation
+in the <TT
+CLASS="FILENAME"
+>source/pam_smbpass</TT
+> directory of the Samba
+source distribution.</P
><P
><TABLE
BORDER="0"
@@ -3139,7 +3148,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN497"
+NAME="AEN499"
>3.2. Distributed Authentication</A
></H1
><P
@@ -3172,7 +3181,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN504"
+NAME="AEN506"
>3.3. PAM Configuration in smb.conf</A
></H1
><P
@@ -3220,7 +3229,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN524"
+NAME="AEN526"
>4.1. Instructions</A
></H1
><P
@@ -3377,7 +3386,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN559"
+NAME="AEN561"
>4.1.1. Notes</A
></H2
><P
@@ -3418,7 +3427,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN579"
+NAME="AEN581"
>5.1. Viewing and changing UNIX permissions using the NT
security dialogs</A
></H1
@@ -3457,7 +3466,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN588"
+NAME="AEN590"
>5.2. How to view file security on a Samba share</A
></H1
><P
@@ -3503,7 +3512,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN599"
+NAME="AEN601"
>5.3. Viewing file ownership</A
></H1
><P
@@ -3589,7 +3598,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN619"
+NAME="AEN621"
>5.4. Viewing file or directory permissions</A
></H1
><P
@@ -3651,7 +3660,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN634"
+NAME="AEN636"
>5.4.1. File Permissions</A
></H2
><P
@@ -3713,7 +3722,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN648"
+NAME="AEN650"
>5.4.2. Directory Permissions</A
></H2
><P
@@ -3745,7 +3754,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN655"
+NAME="AEN657"
>5.5. Modifying file or directory permissions</A
></H1
><P
@@ -3843,7 +3852,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN677"
+NAME="AEN679"
>5.6. Interaction with the standard Samba create mask
parameters</A
></H1
@@ -4116,7 +4125,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN741"
+NAME="AEN743"
>5.7. Interaction with the standard Samba file attribute
mapping</A
></H1
@@ -4171,7 +4180,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN762"
+NAME="AEN764"
>6.1. Introduction</A
></H1
><P
@@ -4255,7 +4264,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN784"
+NAME="AEN786"
>6.2. Configuration</A
></H1
><DIV
@@ -4323,7 +4332,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN795"
+NAME="AEN797"
>6.2.1. Creating [print$]</A
></H2
><P
@@ -4524,7 +4533,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN830"
+NAME="AEN832"
>6.2.2. Setting Drivers for Existing Printers</A
></H2
><P
@@ -4596,7 +4605,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN847"
+NAME="AEN849"
>6.2.3. Support a large number of printers</A
></H2
><P
@@ -4671,7 +4680,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN858"
+NAME="AEN860"
>6.2.4. Adding New Printers via the Windows NT APW</A
></H2
><P
@@ -4777,7 +4786,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN883"
+NAME="AEN885"
>6.2.5. Samba and Printer Ports</A
></H2
><P
@@ -4814,7 +4823,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN891"
+NAME="AEN893"
>6.3. The Imprints Toolset</A
></H1
><P
@@ -4832,7 +4841,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN895"
+NAME="AEN897"
>6.3.1. What is Imprints?</A
></H2
><P
@@ -4864,7 +4873,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN905"
+NAME="AEN907"
>6.3.2. Creating Printer Driver Packages</A
></H2
><P
@@ -4880,7 +4889,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN908"
+NAME="AEN910"
>6.3.3. The Imprints server</A
></H2
><P
@@ -4900,7 +4909,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN912"
+NAME="AEN914"
>6.3.4. The Installation Client</A
></H2
><P
@@ -5003,7 +5012,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN934"
+NAME="AEN936"
>6.4. <A
NAME="MIGRATION"
></A
@@ -5167,20 +5176,11 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN988"
+NAME="AEN990"
>7.1. Joining an NT Domain with Samba 2.2</A
></H1
><P
->In order for a Samba-2 server to join an NT domain,
- you must first add the NetBIOS name of the Samba server to the
- NT domain on the PDC using Server Manager for Domains. This creates
- the machine account in the domain (PDC) SAM. Note that you should
- add the Samba server as a "Windows NT Workstation or Server",
- <EM
->NOT</EM
-> as a Primary or backup domain controller.</P
-><P
->Assume you have a Samba-2 server with a NetBIOS name of
+>Assume you have a Samba 2.x server with a NetBIOS name of
<TT
CLASS="CONSTANT"
>SERV1</TT
@@ -5212,13 +5212,26 @@ CLASS="PROMPT"
CLASS="USERINPUT"
><B
>smbpasswd -j DOM -r DOMPDC
- </B
+ -U<TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+></B
></TT
></P
><P
>as we are joining the domain DOM and the PDC for that domain
(the only machine that has write access to the domain SAM database)
- is DOMPDC. If this is successful you will see the message:</P
+ is DOMPDC. The <TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+> is
+ the login name and password for an account which has the necessary
+ privilege to add machines to the domain. If this is successful
+ you will see the message:</P
><P
><TT
CLASS="COMPUTEROUTPUT"
@@ -5394,7 +5407,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1052"
+NAME="AEN1054"
>7.2. Samba and Windows 2000 Domains</A
></H1
><P
@@ -5419,7 +5432,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1057"
+NAME="AEN1059"
>7.3. Why is this better than security = server?</A
></H1
><P
@@ -5513,7 +5526,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN1090"
+NAME="AEN1092"
>8.1. Prerequisite Reading</A
></H1
><P
@@ -5541,7 +5554,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1096"
+NAME="AEN1098"
>8.2. Background</A
></H1
><DIV
@@ -5698,7 +5711,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1138"
+NAME="AEN1140"
>8.3. Configuring the Samba Domain Controller</A
></H1
><P
@@ -5915,7 +5928,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1180"
+NAME="AEN1182"
>8.4. Creating Machine Trust Accounts and Joining Clients
to the Domain</A
></H1
@@ -5973,7 +5986,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1194"
+NAME="AEN1196"
>8.4.1. Manually creating machine trust accounts</A
></H2
><P
@@ -6124,7 +6137,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1225"
+NAME="AEN1227"
>8.4.2. Creating machine trust accounts "on the fly"</A
></H2
><P
@@ -6172,7 +6185,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1236"
+NAME="AEN1238"
>8.5. Common Problems and Errors</A
></H1
><P
@@ -6371,7 +6384,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1284"
+NAME="AEN1286"
>8.6. System Policies and Profiles</A
></H1
><P
@@ -6528,7 +6541,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1328"
+NAME="AEN1330"
>8.7. What other help can I get ?</A
></H1
><P
@@ -6924,7 +6937,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1442"
+NAME="AEN1444"
>8.8. Domain Control for Windows 9x/ME</A
></H1
><DIV
@@ -7060,7 +7073,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1472"
+NAME="AEN1474"
>8.8.1. Configuration Instructions: Network Logons</A
></H2
><P
@@ -7249,7 +7262,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1506"
+NAME="AEN1508"
>8.8.2. Configuration Instructions: Setting up Roaming User Profiles</A
></H2
><DIV
@@ -7296,7 +7309,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1514"
+NAME="AEN1516"
>8.8.2.1. Windows NT Configuration</A
></H3
><P
@@ -7340,7 +7353,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1522"
+NAME="AEN1524"
>8.8.2.2. Windows 9X Configuration</A
></H3
><P
@@ -7380,7 +7393,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1530"
+NAME="AEN1532"
>8.8.2.3. Win9X and WinNT Configuration</A
></H3
><P
@@ -7418,7 +7431,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1537"
+NAME="AEN1539"
>8.8.2.4. Windows 9X Profile Setup</A
></H3
><P
@@ -7574,7 +7587,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1573"
+NAME="AEN1575"
>8.8.2.5. Windows NT Workstation 4.0</A
></H3
><P
@@ -7656,7 +7669,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1586"
+NAME="AEN1588"
>8.8.2.6. Windows NT Server</A
></H3
><P
@@ -7670,7 +7683,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1589"
+NAME="AEN1591"
>8.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</A
></H3
><DIV
@@ -7735,7 +7748,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1599"
+NAME="AEN1601"
>8.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
></H1
><DIV
@@ -7864,7 +7877,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN1642"
+NAME="AEN1644"
>9.1. Abstract</A
></H1
><P
@@ -7887,7 +7900,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1646"
+NAME="AEN1648"
>9.2. Introduction</A
></H1
><P
@@ -7941,7 +7954,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1659"
+NAME="AEN1661"
>9.3. What Winbind Provides</A
></H1
><P
@@ -7983,7 +7996,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1666"
+NAME="AEN1668"
>9.3.1. Target Uses</A
></H2
><P
@@ -8007,7 +8020,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1670"
+NAME="AEN1672"
>9.4. How Winbind Works</A
></H1
><P
@@ -8027,7 +8040,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1675"
+NAME="AEN1677"
>9.4.1. Microsoft Remote Procedure Calls</A
></H2
><P
@@ -8053,7 +8066,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1679"
+NAME="AEN1681"
>9.4.2. Name Service Switch</A
></H2
><P
@@ -8133,7 +8146,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1695"
+NAME="AEN1697"
>9.4.3. Pluggable Authentication Modules</A
></H2
><P
@@ -8182,7 +8195,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1703"
+NAME="AEN1705"
>9.4.4. User and Group ID Allocation</A
></H2
><P
@@ -8208,7 +8221,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1707"
+NAME="AEN1709"
>9.4.5. Result Caching</A
></H2
><P
@@ -8231,7 +8244,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1710"
+NAME="AEN1712"
>9.5. Installation and Configuration</A
></H1
><P
@@ -8250,7 +8263,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1715"
+NAME="AEN1717"
>9.5.1. Introduction</A
></H2
><P
@@ -8301,7 +8314,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1728"
+NAME="AEN1730"
>9.5.2. Requirements</A
></H2
><P
@@ -8341,7 +8354,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1736"
+NAME="AEN1738"
>9.5.3. Testing Things Out</A
></H2
><P
@@ -8379,7 +8392,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1745"
+NAME="AEN1747"
>9.5.3.1. Configure and compile SAMBA</A
></H3
><P
@@ -8433,7 +8446,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1757"
+NAME="AEN1759"
>9.5.3.2. Configure nsswitch.conf and the winbind libraries</A
></H3
><P
@@ -8503,7 +8516,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1776"
+NAME="AEN1778"
>9.5.3.3. Configure smb.conf</A
></H3
><P
@@ -8558,7 +8571,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1785"
+NAME="AEN1787"
>9.5.3.4. Join the SAMBA server to the PDC domain</A
></H3
><P
@@ -8601,7 +8614,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1795"
+NAME="AEN1797"
>9.5.3.5. Start up the winbindd daemon and test it!</A
></H3
><P
@@ -8715,7 +8728,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1822"
+NAME="AEN1824"
>9.5.3.6. Fix the /etc/rc.d/init.d/smb startup files</A
></H3
><P
@@ -8828,7 +8841,7 @@ CLASS="SECT3"
><HR><H3
CLASS="SECT3"
><A
-NAME="AEN1839"
+NAME="AEN1841"
>9.5.3.7. Configure Winbind and PAM</A
></H3
><P
@@ -9040,7 +9053,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1880"
+NAME="AEN1882"
>9.6. Limitations</A
></H1
><P
@@ -9081,7 +9094,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1890"
+NAME="AEN1892"
>9.7. Conclusion</A
></H1
><P
@@ -9105,7 +9118,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN1904"
+NAME="AEN1906"
>10.1. FAQs</A
></H1
><DIV
@@ -9113,7 +9126,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN1906"
+NAME="AEN1908"
>10.1.1. How can I configure OS/2 Warp Connect or
OS/2 Warp 4 as a client for Samba?</A
></H2
@@ -9172,7 +9185,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1921"
+NAME="AEN1923"
>10.1.2. How can I configure OS/2 Warp 3 (not Connect),
OS/2 1.2, 1.3 or 2.x for Samba?</A
></H2
@@ -9225,7 +9238,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1930"
+NAME="AEN1932"
>10.1.3. Are there any other issues when OS/2 (any version)
is used as a client?</A
></H2
@@ -9247,7 +9260,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1934"
+NAME="AEN1936"
>10.1.4. How do I get printer driver download working
for OS/2 clients?</A
></H2
@@ -9303,7 +9316,7 @@ CLASS="SECT1"
><H1
CLASS="SECT1"
><A
-NAME="AEN1950"
+NAME="AEN1952"
>11.1. Introduction</A
></H1
><P
@@ -9325,7 +9338,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN1955"
+NAME="AEN1957"
>11.2. CVS Access to samba.org</A
></H1
><P
@@ -9338,7 +9351,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1958"
+NAME="AEN1960"
>11.2.1. Access via CVSweb</A
></H2
><P
@@ -9359,7 +9372,7 @@ CLASS="SECT2"
><HR><H2
CLASS="SECT2"
><A
-NAME="AEN1963"
+NAME="AEN1965"
>11.2.2. Access via cvs</A
></H2
><P
@@ -9465,14 +9478,14 @@ CLASS="COMMAND"
></DIV
><HR><H1
><A
-NAME="AEN1991"
+NAME="AEN1993"
>Index</A
></H1
><DL
><DT
>Primary Domain Controller,
<A
-HREF="x1096.htm"
+HREF="x1098.htm"
>Background</A
>
</DT
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index 31afa11cf89..ad8c7c61ab7 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -37,7 +37,7 @@ NAME="AEN8"
><B
CLASS="COMMAND"
>nmbd</B
-> [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-H &#60;lmhosts file&#62;] [-l &#60;log file&#62;] [-n &#60;primary netbios name&#62;] [-p &#60;port number&#62;] [-s &#60;configuration file&#62;]</P
+> [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-H &#60;lmhosts file&#62;] [-l &#60;log directory&#62;] [-n &#60;primary netbios name&#62;] [-p &#60;port number&#62;] [-s &#60;configuration file&#62;]</P
></DIV
><DIV
CLASS="REFSECT1"
@@ -275,22 +275,19 @@ CLASS="FILENAME"
> file.</P
></DD
><DT
->-l &#60;log file&#62;</DT
+>-l &#60;log directory&#62;</DT
><DD
><P
->The -l parameter specifies a path
- and base filename into which operational data from
- the running <B
+>The -l parameter specifies a directory
+ into which the "log.nmbd" log file will be created
+ for operational data from the running
+ <B
CLASS="COMMAND"
>nmbd</B
-> server will
- be logged. The actual log file name is generated by
- appending the extension ".nmb" to the specified base
- name. For example, if the name specified was "log"
- then the file log.nmb would contain the debugging data.</P
-><P
->The default log file path is compiled into Samba as
- part of the build process. Common defaults are <TT
+> server.</P
+><P
+>The default log directory is compiled into Samba
+ as part of the build process. Common defaults are <TT
CLASS="FILENAME"
> /usr/local/samba/var/log.nmb</TT
>, <TT
diff --git a/docs/htmldocs/samba-pdc-faq.html b/docs/htmldocs/samba-pdc-faq.html
index 058a5d5f518..d9c204bf1b5 100644
--- a/docs/htmldocs/samba-pdc-faq.html
+++ b/docs/htmldocs/samba-pdc-faq.html
@@ -45,9 +45,9 @@ NAME="AEN12"
></H1
><P
> This is the FAQ for Samba 2.2 as an NTDomain controller.
- This document is derived from the origional FAQ that was built and
+ This document is derived from the original FAQ that was built and
maintained by Gerald Carter from the early days of Samba NTDomain development
- up until recently. It is now being updated as significent changes are
+ up until recently. It is now being updated as significant changes are
made to 2.2.0.
</P
><P
@@ -165,7 +165,7 @@ HREF="#AEN103"
><A
HREF="#AEN110"
>"The machine account for this computer either does not
-exist or is not accessable."</A
+exist or is not accessible."</A
></DT
><DT
><A
@@ -256,7 +256,7 @@ HREF="#AEN180"
><DT
><A
HREF="#AEN182"
->What are 'Policies' ?.</A
+>What are 'Policies' ?</A
></DT
><DT
><A
@@ -314,12 +314,12 @@ HREF="#AEN248"
><A
HREF="#AEN250"
>What editor can I use in DOS/Windows that won't
-mess with my unix EOF</A
+mess with my unix EOF ?</A
></DT
><DT
><A
HREF="#AEN263"
->How do I get 'User Manager' and 'Server Manager'</A
+>How do I get 'User Manager' and 'Server Manager' ?</A
></DT
><DT
><A
@@ -334,7 +334,7 @@ HREF="#AEN282"
><DT
><A
HREF="#AEN286"
->How do I get my samba server to become a member ( not PDC ) of an NT domain?</A
+>How do I get my samba server to become a member ( not PDC ) of an NT domain ?</A
></DT
></DL
></DD
@@ -358,13 +358,13 @@ HREF="#AEN292"
><A
HREF="#AEN294"
>What are some diagnostics tools I can use to debug the domain logon process and where can I
- find them?</A
+ find them ?</A
></DT
><DT
><A
HREF="#AEN309"
>How do I install 'Network Monitor' on an NT Workstation
-or a Windows 9x box?</A
+or a Windows 9x box ?</A
></DT
></DL
></DD
@@ -419,13 +419,13 @@ CLASS="FILENAME"
> dialog
will let you reset the smbpasswd. That is you don't need to do it from
the unix box. However, at the present, you do need to have root as an
- administrator and use the root user name and password.</P
+ administrator and use the root username and password.</P
><P
><B
CLASS="COMMAND"
>Policies</B
> do work on a W2K machine. MS says that recent
- builds of W2K dont observe an NT policy but it appears it does in 'legacy'
+ builds of W2K don't observe an NT policy but it appears it does in 'legacy'
mode.</P
></DIV
><DIV
@@ -437,7 +437,7 @@ NAME="AEN27"
>Introduction</A
></H1
><P
-> This FAQ was origionally compiled by Jerry Carter (gc) chiefly dealing
+> This FAQ was originally compiled by Jerry Carter (gc) chiefly dealing
with the 'old HEAD' version of Samba and its NTDomain facilities. It is
being rewritten by David Bannon (drb) so that it addresses more
accurately the Samba 2.2.x release.
@@ -454,7 +454,7 @@ TARGET="_top"
</P
><P
>Hopefully, as we all become familiar with the Samba 2.2 as a
- PDC this document will become much more usefull.</P
+ PDC this document will become much more useful.</P
></DIV
></DIV
><DIV
@@ -532,7 +532,7 @@ NAME="AEN37"
></LI
></UL
><P
-> These things are note expected to work in the forseeable future:
+> These things are not expected to work in the foreseeable future:
</P
><P
></P
@@ -558,7 +558,7 @@ controlled domain?</A
></H2
><P
> The 2.2 release branch of Samba supports Windows 2000 domain
- clients in legacy mode, ie as if the PDC is a NTServer, not a
+ clients in legacy mode, i.e. as if the PDC is a NTServer, not a
W2K server.
</P
></DIV
@@ -572,7 +572,7 @@ NAME="AEN65"
>CVS</A
></H1
><P
-> CVS is a programme (publically available) that the Samba developers
+> CVS is a program (publicly available) that the Samba developers
use to maintain the central source code. Non developers can get
access to the source in a read only capacity. Many flavours of unix
now arrive with cvs installed.</P
@@ -606,7 +606,7 @@ CLASS="VARIABLELIST"
><P
>Samba 3.0 ? This code boasts all the main
development work in Samba. Due to its developmental
- nature, its not really suitable for production work.
+ nature, it's not really suitable for production work.
</P
></DD
><DT
@@ -693,7 +693,7 @@ controlled Domain?</A
HREF="samba-pdc-howto.html"
TARGET="_top"
>HOWTO</A
-> accessable from the samba web
+> accessible from the samba web
site under 'Documentation'. Read it.
</P
></DIV
@@ -734,11 +734,11 @@ CLASS="SECT2"
><A
NAME="AEN110"
>"The machine account for this computer either does not
-exist or is not accessable."</A
+exist or is not accessible."</A
></H2
><P
> When I try to join the domain I get the message "The machine account
- for this computer either does not exist or is not accessable". Whats
+ for this computer either does not exist or is not accessible". Whats
wrong ?
</P
><P
@@ -802,7 +802,7 @@ CLASS="COMMAND"
path to the <B
CLASS="COMMAND"
>smbpasswd</B
-> programme, do this :
+> program, do this :
</P
><P
> <B
@@ -812,7 +812,7 @@ CLASS="COMMAND"
</P
><P
> The entry will be created with a well known password, so any machine that
- says its doppy could join the domain as long as it gets in first. So
+ says it's doppy could join the domain as long as it gets in first. So
don't create the accounts any earlier than you need them.
</P
></DIV
@@ -854,7 +854,7 @@ when creating a machine account.</A
><P
> This happens if you try to create a machine account from the
machine itself and use a user name that does not work (for whatever
- reason) and then try another (possibly valid) user name.
+ reason) and then try another (possibly valid) username.
Exit out of the network applet to close the initial connection
and try again.
</P
@@ -891,7 +891,7 @@ NAME="AEN143"
><P
>I joined the domain successfully but after upgrading
to a newer version of the Samba code I get the message, "The system
- can not log you on (C000019B), Please try a gain or consult your
+ can not log you on (C000019B), Please try again or consult your
system administrator" when attempting to logon.
</P
><P
@@ -1029,14 +1029,14 @@ HREF="#AEN278"
>
</P
><P
-> Make sure that the "logon path" is writeable by the user and make sure
+> Make sure that the "logon path" is writable by the user and make sure
that the connection to the logon path location is by the current user.
- Sometimes Windows client do not drop the connection immediately upon
+ Sometimes Windows clients do not drop the connection immediately upon
logoff.
</P
><P
> Some people have reported that the logon path location should
- also be browseable. I (GC) have yet to emperically verify this,
+ also be browseable. I (GC) have yet to empirically verify this,
but you can try.</P
></DIV
></DIV
@@ -1054,13 +1054,13 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="AEN182"
->What are 'Policies' ?.</A
+>What are 'Policies' ?</A
></H2
><P
> When a user logs onto the domain via a client machine, the PDC
sends the client machine a list of things contained in the
'policy' (if it exists). This list may do things like suppress
- a splach screen, format the dates the way you like them or perhaps
+ a splash screen, format the dates the way you like them or perhaps
remove locally stored profiles.
</P
><P
@@ -1070,7 +1070,7 @@ CLASS="FILENAME"
>ntconfig.pol</TT
> and located in the [netlogon]
share. The file is created with a policy editor and must be readable
- by anyone and writeable by only root. See <A
+ by anyone and writable by only root. See <A
HREF="#AEN203"
> below</A
> for how to get a suitable editor.
@@ -1102,7 +1102,7 @@ CLASS="PROGRAMLISTING"
></P
><P
> A policy file must be in the [netlogon] share and must be
- readable by everyone and writeable by only root. The file
+ readable by everyone and writable by only root. The file
must be created by an NTServer <A
HREF="#AEN203"
>Policy
@@ -1170,7 +1170,7 @@ CLASS="EMPHASIS"
>.
Further, although the Windows 95
Policy Editor can be installed on an NT Workstation/Server, it will not
- work with NT policies because the registry key that are set by the policy templates.
+ work with NT policies because of the registry keys that are set by the policy templates.
However, the files from the NT Server will run happily enough on an NTws.
You need <TT
CLASS="FILENAME"
@@ -1192,7 +1192,7 @@ CLASS="FILENAME"
<B
CLASS="COMMAND"
>servicepackname /x</B
->, ie thats <B
+>, i.e. that's <B
CLASS="COMMAND"
>Nt4sp6ai.exe
/x</B
@@ -1201,7 +1201,7 @@ CLASS="COMMAND"
>poledt.exe</B
> and the
associated template files (*.adm) should
- be extracted as well. It is also possible to downloaded the policy template
+ be extracted as well. It is also possible to download the policy template
files for Office97 and get a copy of the policy editor. Another possible
location is with the Zero Administration Kit available for download from Microsoft.
</P
@@ -1261,7 +1261,7 @@ CLASS="FILENAME"
CLASS="FILENAME"
>/etc/shadow</TT
>).
- In lots of situations thats OK, for example :
+ In lots of situations that's OK, for example :
</P
><P
></P
@@ -1278,10 +1278,10 @@ CLASS="FILENAME"
></LI
></UL
><P
-> But sometimes you really do need to maintain two seperate password
+> But sometimes you really do need to maintain two separate password
databases and there are good reasons to keep then in sync. Trying
to explain to users that they need to change their passwords in two
- seperate places or use two seperate passwords is not fun.
+ separate places or use two separate passwords is not fun.
</P
><P
> However do understand that setting up password sync is not without
@@ -1358,11 +1358,11 @@ CLASS="SECT2"
><A
NAME="AEN250"
>What editor can I use in DOS/Windows that won't
-mess with my unix EOF</A
+mess with my unix EOF ?</A
></H2
><P
>There are a number of Windows or DOS based editors that will
- understand, and leave intact, the unix eof (as opposed to a DOS CL/LF).
+ understand, and leave intact, the unix eof (as opposed to a DOS CR/LF).
List members suggested :
</P
><P
@@ -1390,7 +1390,7 @@ TARGET="_top"
HREF="http://www.lancs.ac.uk/people/cpaap/pfe/"
TARGET="_top"
> www.lancs.ac.uk/people/cpaap/pfe/</A
-> but its no longer being developed...</P
+> but it's no longer being developed...</P
></LI
></UL
></DIV
@@ -1400,7 +1400,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="AEN263"
->How do I get 'User Manager' and 'Server Manager'</A
+>How do I get 'User Manager' and 'Server Manager' ?</A
></H2
><P
> Since I don't need to buy an NT Server CD now, how do I get
@@ -1409,7 +1409,7 @@ NAME="AEN263"
><P
> Microsoft distributes a version of
these tools called nexus for installation on Windows 95 systems. The
- tools set includes
+ tool set includes
</P
><P
></P
@@ -1482,7 +1482,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="AEN286"
->How do I get my samba server to become a member ( not PDC ) of an NT domain?</A
+>How do I get my samba server to become a member ( not PDC ) of an NT domain ?</A
></H2
><P
> Please refer to the <A
@@ -1517,11 +1517,11 @@ CLASS="SECT2"
><A
NAME="AEN294"
>What are some diagnostics tools I can use to debug the domain logon process and where can I
- find them?</A
+ find them ?</A
></H2
><P
> One of the best diagnostic tools for debugging problems is Samba itself.
- You can use the -d option for both smbd and nmbd to specifiy what
+ You can use the -d option for both smbd and nmbd to specify what
'debug level' at which to run. See the man pages on smbd, nmbd and
smb.conf for more information on debugging options. The debug
level can range from 1 (the default) to 10 (100 for debugging passwords).
@@ -1532,19 +1532,19 @@ NAME="AEN294"
CLASS="COMMAND"
>gcc -g </B
> flag. This will include debug
- information in the binaries and allow you to attch gdb to the
+ information in the binaries and allow you to attach gdb to the
running smbd / nmbd process. In order to attach gdb to an smbd
process for an NT workstation, first get the workstation to make the
- connection. Pressing ctrl-alt-delete and going down to the domain box
+ connection. Pressing Ctrl-Alt-Del and going down to the domain box
is sufficient (at least, on the first time you join the domain) to
generate a 'LsaEnumTrustedDomains'. Thereafter, the workstation
maintains an open connection, and therefore there will be an smbd
process running (assuming that you haven't set a really short smbd
- idle timeout) So, in between pressing ctrl alt delete, and actually
+ idle timeout) So, in between pressing Ctrl-Alt-Del, and actually
typing in your password, you can gdb attach and continue.
</P
><P
-> Some usefull samba commands worth investigating:
+> Some useful samba commands worth investigating:
</P
><P
></P
@@ -1563,7 +1563,7 @@ CLASS="COMMAND"
<A
HREF="http://www.tcpdump.org/"
TARGET="_top"
->http://www.tcpdup.org/</A
+>http://www.tcpdump.org/</A
>.
Ethereal, another good packet sniffer for UNIX and Win32
hosts, can be downloaded from <A
@@ -1573,11 +1573,11 @@ TARGET="_top"
>.
</P
><P
-> For tracing things on the Microsoft Windows NT, Network Monitor
+> For tracing things on Microsoft Windows NT, Network Monitor
(aka. netmon) is available on the Microsoft Developer Network CD's,
the Windows NT Server install CD and the SMS CD's. The version of
netmon that ships with SMS allows for dumping packets between any two
- computers (ie. placing the network interface in promiscuous mode).
+ computers (i.e. placing the network interface in promiscuous mode).
The version on the NT Server install CD will only allow monitoring
of network traffic directed to the local NT box and broadcasts on the
local subnet. Be aware that Ethereal can read and write netmon
@@ -1591,7 +1591,7 @@ CLASS="SECT2"
><A
NAME="AEN309"
>How do I install 'Network Monitor' on an NT Workstation
-or a Windows 9x box?</A
+or a Windows 9x box ?</A
></H2
><P
> Installing netmon on an NT workstation requires a couple
@@ -1732,13 +1732,13 @@ CLASS="EMPHASIS"
></LI
><LI
><P
-> Ignacio Coupeau has a very comprehesive look at LDAP with Samba at
+> Ignacio Coupeau has a very comprehensive look at LDAP with Samba at
<A
HREF="http://www.unav.es/cti/ldap-smb-howto.html"
TARGET="_top"
> http://www.unav.es/cti/ldap-smb-howto.html</A
>
- Be a little carefull however, I suspect that it does not specificly
+ Be a little careful however, I suspect that it does not specifically
address samba 2.2.x. The HEAD pre-2.1 may possibly be the best
stream to look at.</P
></LI
@@ -1754,7 +1754,7 @@ HREF="http://www.kneschke.de/projekte/samba_tng"
TARGET="_top"
> http://www.kneschke.de/projekte/samba_tng</A
>, but again, a
- lot of it does not apply to the main stream Samba.</P
+ lot of it does not apply to the mainstream Samba.</P
></LI
><LI
><P
@@ -1839,7 +1839,7 @@ TARGET="_top"
>http://www.samba-tng.org/</A
>
It has been requested that you don't post questions about Samba-TNG to the
- main stream Samba lists.</P
+ mainstream Samba lists.</P
><P
></P
><P
@@ -1872,18 +1872,18 @@ TARGET="_top"
> Try and make your question clear and brief, lots of long,
convoluted questions get deleted before they are completely read !
Don't post html encoded messages (if you can select colour or font
- size its html).</P
+ size it's html).</P
></LI
><LI
><P
-> If you run one of those niffy 'I'm on holidays' things when
+> If you run one of those nifty 'I'm on holidays' things when
you are away, make sure its configured to not answer mailing lists.
</P
></LI
><LI
><P
> Don't cross post. Work out which is the best list to post to
- and see what happens, ie don't post to both samba-ntdom and samba-technical.
+ and see what happens, i.e. don't post to both samba-ntdom and samba-technical.
Many people active on the lists subscribe to more
than one list and get annoyed to see the same message two or more times.
Often someone will see a message and thinking it would be better dealt
@@ -1943,7 +1943,7 @@ TARGET="_top"
></P
><P
> Please don't post messages to the list asking to be removed, you will just
- be refered to the above address (unless that process failed in some way...)
+ be referred to the above address (unless that process failed in some way...)
</P
></DIV
></DIV
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 5fe4f3cf977..1ba81fed5b3 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -1461,6 +1461,78 @@ CLASS="PARAMETER"
><LI
><P
><A
+HREF="#LDAPADMINDN"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap admin dn</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LDAPFILTER"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap filter</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LDAPPORT"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap port</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LDAPSERVER"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap server</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LDAPSSL"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap ssl</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LDAPSUFFIX"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap suffix</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
HREF="#LMANNOUNCE"
><TT
CLASS="PARAMETER"
@@ -1881,18 +1953,6 @@ CLASS="PARAMETER"
><LI
><P
><A
-HREF="#NTACLSUPPORT"
-><TT
-CLASS="PARAMETER"
-><I
->nt acl support</I
-></TT
-></A
-></P
-></LI
-><LI
-><P
-><A
HREF="#NTPIPESUPPORT"
><TT
CLASS="PARAMETER"
@@ -2433,6 +2493,42 @@ CLASS="PARAMETER"
><LI
><P
><A
+HREF="#SSLEGDSOCKET"
+><TT
+CLASS="PARAMETER"
+><I
+>ssl egd socket</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#SSLENTROPYBYTES"
+><TT
+CLASS="PARAMETER"
+><I
+>ssl entropy bytes</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#SSLENTROPYFILE"
+><TT
+CLASS="PARAMETER"
+><I
+>ssl entropy file</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
HREF="#SSLHOSTS"
><TT
CLASS="PARAMETER"
@@ -2673,6 +2769,18 @@ CLASS="PARAMETER"
><LI
><P
><A
+HREF="#USEMMAP"
+><TT
+CLASS="PARAMETER"
+><I
+>use mmap</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
HREF="#USERHOSTS"
><TT
CLASS="PARAMETER"
@@ -2891,7 +2999,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN934"
+NAME="AEN970"
></A
><H2
>COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -3684,6 +3792,18 @@ CLASS="PARAMETER"
><LI
><P
><A
+HREF="#NTACLSUPPORT"
+><TT
+CLASS="PARAMETER"
+><I
+>nt acl support</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
HREF="#ONLYGUEST"
><TT
CLASS="PARAMETER"
@@ -4068,6 +4188,18 @@ CLASS="PARAMETER"
><LI
><P
><A
+HREF="#STRICTALLOCATE"
+><TT
+CLASS="PARAMETER"
+><I
+>strict allocate</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
HREF="#STRICTLOCKING"
><TT
CLASS="PARAMETER"
@@ -4298,7 +4430,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1402"
+NAME="AEN1446"
></A
><H2
>EXPLANATION OF EACH PARAMETER</H2
@@ -8055,22 +8187,6 @@ CLASS="PARAMETER"
>
parameter is applied.</P
><P
->Note that by default this parameter does not apply to permissions
- set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
- this mask on access control lists also, they need to set the <A
-HREF="#RESTRICTACLWITHMASK"
-><TT
-CLASS="PARAMETER"
-><I
->restrict acl with
- mask</I
-></TT
-></A
-> to <TT
-CLASS="CONSTANT"
->true</TT
->.</P
-><P
>See also the parameter <A
HREF="#CREATEMASK"
><TT
@@ -8130,22 +8246,6 @@ CLASS="PARAMETER"
> is
applied.</P
><P
->Note that by default this parameter does not apply to permissions
- set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
- this mask on access control lists also, they need to set the <A
-HREF="#RESTRICTACLWITHMASK"
-><TT
-CLASS="PARAMETER"
-><I
->restrict acl with
- mask</I
-></TT
-></A
-> to <TT
-CLASS="CONSTANT"
->true</TT
->.</P
-><P
>See also the parameter <A
HREF="#DIRECTORYMASK"
><TT
@@ -9569,6 +9669,250 @@ CLASS="COMMAND"
></DD
><DT
><A
+NAME="LDAPADMINDN"
+></A
+>ldap admin dn (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+ configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+ at compile time. This option should be considered experimental and
+ under active development.
+ </P
+><P
+> The <TT
+CLASS="PARAMETER"
+><I
+>ldap admin dn</I
+></TT
+> defines the Distinguished
+ Name (DN) name used by Samba to contact the <A
+HREF="#LDAPSERVER"
+>ldap
+ server</A
+> when retreiving user account information. The <TT
+CLASS="PARAMETER"
+><I
+>ldap
+ admin dn</I
+></TT
+> is used in conjunction with the admin dn password
+ stored in the <TT
+CLASS="FILENAME"
+>private/secrets.tdb</TT
+> file. See the
+ <A
+HREF="smbpasswd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbpasswd(8)</B
+></A
+> man
+ page for more information on how to accmplish this.
+ </P
+><P
+>Default : <EM
+>none</EM
+></P
+></DD
+><DT
+><A
+NAME="LDAPFILTER"
+></A
+>ldap filter (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+ configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+ at compile time. This option should be considered experimental and
+ under active development.
+ </P
+><P
+> This parameter specifies the RFC 2254 compliant LDAP search filter.
+ The default is to match the login name with the <TT
+CLASS="CONSTANT"
+>uid</TT
+>
+ attribute for all entries matching the <TT
+CLASS="CONSTANT"
+>sambaAccount</TT
+>
+ objectclass. Note that this filter should only return one entry.
+ </P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap filter = (&#38;(uid=%u)(objectclass=sambaAccount))</B
+></P
+></DD
+><DT
+><A
+NAME="LDAPPORT"
+></A
+>ldap port (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+ configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+ at compile time. This option should be considered experimental and
+ under active development.
+ </P
+><P
+> This option is used to control the tcp port number used to contact
+ the <A
+HREF="#LDAPSERVER"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap server</I
+></TT
+></A
+>.
+ The default is to use the stand LDAP port 389.
+ </P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap port = 389</B
+></P
+></DD
+><DT
+><A
+NAME="LDAPSERVER"
+></A
+>ldap server (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+ configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+ at compile time. This option should be considered experimental and
+ under active development.
+ </P
+><P
+> This parameter should contains the FQDN of the ldap directory
+ server which should be queried to locate user account information.
+ </P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap server = localhost</B
+></P
+></DD
+><DT
+><A
+NAME="LDAPSSL"
+></A
+>ldap ssl (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+ configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+ at compile time. This option should be considered experimental and
+ under active development.
+ </P
+><P
+> This option is used to define whether or not Samba should
+ use SSL when connecting to the <A
+HREF="#LDAPSERVER"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap
+ server</I
+></TT
+></A
+>. This is <EM
+>NOT</EM
+> related to
+ Samba SSL support which is enabled by specifying the
+ <B
+CLASS="COMMAND"
+>--with-ssl</B
+> option to the <TT
+CLASS="FILENAME"
+>configure</TT
+>
+ script (see <A
+HREF="#SSL"
+><TT
+CLASS="PARAMETER"
+><I
+>ssl</I
+></TT
+></A
+>).
+ </P
+><P
+> The <TT
+CLASS="PARAMETER"
+><I
+>ldap ssl</I
+></TT
+> can be set to one of three values:
+ (a) <B
+CLASS="COMMAND"
+>on</B
+> - Always use SSL when contacting the
+ <TT
+CLASS="PARAMETER"
+><I
+>ldap server</I
+></TT
+>, (b) <B
+CLASS="COMMAND"
+>off</B
+> -
+ Never use SSL when querying the directory, or (c) <B
+CLASS="COMMAND"
+>start
+ tls</B
+> - Use the LDAPv3 StartTLS extended operation
+ (RFC2830) for communicating with the directory server.
+ </P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap ssl = off</B
+></P
+></DD
+><DT
+><A
+NAME="LDAPSUFFIX"
+></A
+>ldap suffix (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+ configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+ at compile time. This option should be considered experimental and
+ under active development.
+ </P
+><P
+>Default : <EM
+>none</EM
+></P
+></DD
+><DT
+><A
NAME="LEVEL2OPLOCKS"
></A
>level2 oplocks (S)</DT
@@ -12228,7 +12572,7 @@ CLASS="COMMAND"
><A
NAME="NTACLSUPPORT"
></A
->nt acl support (G)</DT
+>nt acl support (S)</DT
><DD
><P
>This boolean parameter controls whether
@@ -12237,7 +12581,9 @@ HREF="smbd.8.html"
TARGET="_top"
>smbd(8)</A
> will attempt to map
- UNIX permissions into Windows NT access control lists.</P
+ UNIX permissions into Windows NT access control lists.
+ This parameter was formally a global parameter in releases
+ prior to 2.2.2.</P
><P
>Default: <B
CLASS="COMMAND"
@@ -14773,108 +15119,6 @@ CLASS="COMMAND"
></DD
><DT
><A
-NAME="RESTRICTACLWITHMASK"
-></A
->restrict acl with mask (S)</DT
-><DD
-><P
->This is a boolean parameter. If set to <TT
-CLASS="CONSTANT"
->false</TT
-> (default), then
- creation of files with access control lists (ACLS) and modification of ACLs
- using the Windows NT/2000 ACL editor will be applied directly to the file
- or directory.</P
-><P
->If set to <TT
-CLASS="CONSTANT"
->true</TT
->, then all requests to set an ACL on a file will have the
- parameters <A
-HREF="#CREATEMASK"
-><TT
-CLASS="PARAMETER"
-><I
->create mask</I
-></TT
-></A
->,
- <A
-HREF="#FORCECREATEMODE"
-><TT
-CLASS="PARAMETER"
-><I
->force create mode</I
-></TT
-></A
->
- applied before setting the ACL, and all requests to set an ACL on a directory will
- have the parameters <A
-HREF="#DIRECTORYMASK"
-><TT
-CLASS="PARAMETER"
-><I
->directory
- mask</I
-></TT
-></A
->, <A
-HREF="#FORCEDIRECTORYMODE"
-><TT
-CLASS="PARAMETER"
-><I
->force
- directory mode</I
-></TT
-></A
-> applied before setting the ACL.
- </P
-><P
->See also <A
-HREF="#CREATEMASK"
-><TT
-CLASS="PARAMETER"
-><I
->create mask</I
-></TT
-></A
->,
- <A
-HREF="#FORCECREATEMODE"
-><TT
-CLASS="PARAMETER"
-><I
->force create mode</I
-></TT
-></A
->,
- <A
-HREF="#DIRECTORYMASK"
-><TT
-CLASS="PARAMETER"
-><I
->directory mask</I
-></TT
-></A
->,
- <A
-HREF="#FORCEDIRECTORYMODE"
-><TT
-CLASS="PARAMETER"
-><I
->force directory mode</I
-></TT
-></A
->
- </P
-><P
->Default: <B
-CLASS="COMMAND"
->restrict acl with mask = no</B
-></P
-></DD
-><DT
-><A
NAME="RESTRICTANONYMOUS"
></A
>restrict anonymous (G)</DT
@@ -16290,14 +16534,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This variable enables or disables the entire SSL mode. If
it is set to <TT
CLASS="CONSTANT"
@@ -16346,14 +16582,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This variable defines where to look up the Certification
Authorities. The given directory should contain one file for
each CA that Samba will trust. The file name must be the hash
@@ -16383,14 +16611,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This variable is a second way to define the trusted CAs.
The certificates of the trusted CAs are collected in one big
file and this variable points to the file. You will probably
@@ -16421,14 +16641,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This variable defines the ciphers that should be offered
during SSL negotiation. You should not set this variable unless
you know what you are doing.</P
@@ -16448,14 +16660,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>The certificate in this file is used by <A
HREF="smbclient.1.html"
TARGET="_top"
@@ -16487,14 +16691,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This is the private key for <A
HREF="smbclient.1.html"
TARGET="_top"
@@ -16526,18 +16722,10 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
->This variable defines whether SSLeay should be configured
+>This variable defines whether OpenSSL should be configured
for bug compatibility with other SSL implementations. This is
probably not desirable because currently no clients with SSL
- implementations other than SSLeay exist.</P
+ implementations other than OpenSSL exist.</P
><P
>Default: <B
CLASS="COMMAND"
@@ -16546,6 +16734,104 @@ CLASS="COMMAND"
></DD
><DT
><A
+NAME="SSLEGDSOCKET"
+></A
+>ssl egd socket (G)</DT
+><DD
+><P
+>This variable is part of SSL-enabled Samba. This
+ is only available if the SSL libraries have been compiled on your
+ system and the configure option <B
+CLASS="COMMAND"
+>--with-ssl</B
+> was
+ given at configure time.</P
+><P
+> This option is used to define the location of the communiation socket of
+ an EGD or PRNGD daemon, from which entropy can be retrieved. This option
+ can be used instead of or together with the <A
+HREF="#SSLENTROPYFILE"
+><TT
+CLASS="PARAMETER"
+><I
+>ssl entropy file</I
+></TT
+></A
+>
+ directive. 255 bytes of entropy will be retrieved from the daemon.
+ </P
+><P
+>Default: <EM
+>none</EM
+></P
+></DD
+><DT
+><A
+NAME="SSLENTROPYBYTES"
+></A
+>ssl entropy bytes (G)</DT
+><DD
+><P
+>This variable is part of SSL-enabled Samba. This
+ is only available if the SSL libraries have been compiled on your
+ system and the configure option <B
+CLASS="COMMAND"
+>--with-ssl</B
+> was
+ given at configure time.</P
+><P
+> This parameter is used to define the number of bytes which should
+ be read from the <A
+HREF="#SSLENTROPYFILE"
+><TT
+CLASS="PARAMETER"
+><I
+>ssl entropy
+ file</I
+></TT
+></A
+> If a -1 is specified, the entire file will
+ be read.
+ </P
+><P
+>Default: <B
+CLASS="COMMAND"
+>ssl entropy bytes = 255</B
+></P
+></DD
+><DT
+><A
+NAME="SSLENTROPYFILE"
+></A
+>ssl entropy file (G)</DT
+><DD
+><P
+>This variable is part of SSL-enabled Samba. This
+ is only available if the SSL libraries have been compiled on your
+ system and the configure option <B
+CLASS="COMMAND"
+>--with-ssl</B
+> was
+ given at configure time.</P
+><P
+> This parameter is used to specify a file from which processes will
+ read "random bytes" on startup. In order to seed the internal pseudo
+ random number generator, entropy must be provided. On system with a
+ <TT
+CLASS="FILENAME"
+>/dev/urandom</TT
+> device file, the processes
+ will retrieve its entropy from the kernel. On systems without kernel
+ entropy support, a file can be supplied that will be read on startup
+ and that will be used to seed the PRNG.
+ </P
+><P
+>Default: <EM
+>none</EM
+></P
+></DD
+><DT
+><A
NAME="SSLHOSTS"
></A
>ssl hosts (G)</DT
@@ -16576,14 +16862,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>These two variables define whether Samba will go
into SSL mode or not. If none of them is defined, Samba will
allow only SSL connections. If the <A
@@ -16658,14 +16936,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>If this variable is set to <TT
CLASS="CONSTANT"
>yes</TT
@@ -16724,14 +16994,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>If this variable is set to <TT
CLASS="CONSTANT"
>yes</TT
@@ -16777,14 +17039,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This is the file containing the server's certificate.
The server <EM
>must</EM
@@ -16813,14 +17067,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This file contains the private key of the server. If
this variable is not defined, the key is looked up in the
certificate file (it may be appended to the certificate).
@@ -16853,14 +17099,6 @@ CLASS="COMMAND"
> was
given at configure time.</P
><P
-><EM
->Note</EM
-> that for export control reasons
- this code is <EM
->NOT</EM
-> enabled by default in any
- current binary version of Samba.</P
-><P
>This enumeration variable defines the versions of the
SSL protocol that will be used. <TT
CLASS="CONSTANT"
@@ -16955,6 +17193,43 @@ CLASS="COMMAND"
></DD
><DT
><A
+NAME="STRICTALLOCATE"
+></A
+>strict allocate (S)</DT
+><DD
+><P
+>This is a boolean that controls the handling of
+ disk space allocation in the server. When this is set to <TT
+CLASS="CONSTANT"
+>yes</TT
+>
+ the server will change from UNIX behaviour of not committing real
+ disk storage blocks when a file is extended to the Windows behaviour
+ of actually forcing the disk system to allocate real storage blocks
+ when a file is created or extended to be a given size. In UNIX
+ terminology this means that Samba will stop creating sparse files.
+ This can be slow on some systems.</P
+><P
+>When strict allocate is <TT
+CLASS="CONSTANT"
+>no</TT
+> the server does sparse
+ disk block allocation when a file is extended.</P
+><P
+>Setting this to <TT
+CLASS="CONSTANT"
+>yes</TT
+> can help Samba return
+ out of quota messages on systems that are restricting the disk quota
+ of users.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>strict allocate = no</B
+></P
+></DD
+><DT
+><A
NAME="STRICTLOCKING"
></A
>strict locking (S)</DT
@@ -17458,6 +17733,30 @@ CLASS="COMMAND"
></DD
><DT
><A
+NAME="USEMMAP"
+></A
+>use mmap (G)</DT
+><DD
+><P
+>This global parameter determines if the tdb internals of Samba can
+ depend on mmap working correctly on the running system. Samba requires a coherent
+ mmap/read-write system memory cache. Currently only HPUX does not have such a
+ coherent cache, and so this parameter is set to <TT
+CLASS="CONSTANT"
+>false</TT
+> by
+ default on HPUX. On all other systems this parameter should be left alone. This
+ parameter is provided to help the Samba developers track down problems with
+ the tdb internal code.
+ </P
+><P
+>Default: <B
+CLASS="COMMAND"
+>use mmap = yes</B
+></P
+></DD
+><DT
+><A
NAME="USERHOSTS"
></A
>use rhosts (G)</DT
@@ -18416,7 +18715,7 @@ CLASS="COMMAND"
><P
>Default: <B
CLASS="COMMAND"
->winbind enum groups = no </B
+>winbind enum groups = yes </B
>
</P
></DD
@@ -18883,7 +19182,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5953"
+NAME="AEN6051"
></A
><H2
>WARNINGS</H2
@@ -18913,7 +19212,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5959"
+NAME="AEN6057"
></A
><H2
>VERSION</H2
@@ -18924,7 +19223,7 @@ NAME="AEN5959"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5962"
+NAME="AEN6060"
></A
><H2
>SEE ALSO</H2
@@ -19003,7 +19302,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5982"
+NAME="AEN6080"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index be82ef6d4ec..e093a05f646 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -36,7 +36,7 @@ NAME="AEN8"
><B
CLASS="COMMAND"
>smbd</B
-> [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-l &#60;log file&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
+> [-D] [-a] [-o] [-P] [-h] [-V] [-d &#60;debug level&#62;] [-l &#60;log directory&#62;] [-p &#60;port number&#62;] [-O &#60;socket option&#62;] [-s &#60;configuration file&#62;]</P
></DIV
><DIV
CLASS="REFSECT1"
@@ -228,17 +228,19 @@ CLASS="FILENAME"
> file.</P
></DD
><DT
->-l &#60;log file&#62;</DT
+>-l &#60;log directory&#62;</DT
><DD
><P
->If specified, <TT
+>If specified,
+ <TT
CLASS="REPLACEABLE"
><I
->log file</I
+>log directory</I
></TT
>
- specifies a log filename into which informational and debug
- messages from the running server will be logged. The log
+ specifies a log directory into which the "log.smbd" log
+ file will be created for informational and debug
+ messages from the running server. The log
file generated is never removed by the server although
its size may be controlled by the <A
HREF="smb.conf.5.html#maxlogsize"
@@ -252,8 +254,11 @@ TARGET="_top"
CLASS="FILENAME"
> smb.conf(5)</TT
></A
-> file. The default log
- file name is specified at compile time.</P
+> file.
+ </P
+><P
+>The default log directory is specified at
+ compile time.</P
></DD
><DT
>-O &#60;socket options&#62;</DT
@@ -331,7 +336,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN109"
+NAME="AEN110"
></A
><H2
>FILES</H2
@@ -429,7 +434,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN142"
+NAME="AEN143"
></A
><H2
>LIMITATIONS</H2
@@ -448,7 +453,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN146"
+NAME="AEN147"
></A
><H2
>ENVIRONMENTVARIABLES</H2
@@ -479,7 +484,7 @@ CLASS="CONSTANT"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN155"
+NAME="AEN156"
></A
><H2
>INSTALLATION</H2
@@ -601,7 +606,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN188"
+NAME="AEN189"
></A
><H2
>RUNNING THE SERVER AS A DAEMON</H2
@@ -656,7 +661,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN201"
+NAME="AEN202"
></A
><H2
>RUNNING THE SERVER ON REQUEST</H2
@@ -792,7 +797,7 @@ CLASS="COMPUTEROUTPUT"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN233"
+NAME="AEN234"
></A
><H2
>PAM INTERACTION</H2
@@ -837,7 +842,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN244"
+NAME="AEN245"
></A
><H2
>TESTING THE INSTALLATION</H2
@@ -895,7 +900,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN258"
+NAME="AEN259"
></A
><H2
>VERSION</H2
@@ -906,7 +911,7 @@ NAME="AEN258"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN261"
+NAME="AEN262"
></A
><H2
>DIAGNOSTICS</H2
@@ -929,7 +934,7 @@ NAME="AEN261"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN266"
+NAME="AEN267"
></A
><H2
>SIGNALS</H2
@@ -994,7 +999,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN283"
+NAME="AEN284"
></A
><H2
>SEE ALSO</H2
@@ -1060,7 +1065,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN300"
+NAME="AEN301"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index be82bc88098..c8f97c89d13 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -36,12 +36,12 @@ NAME="AEN8"
><B
CLASS="COMMAND"
>smbpasswd</B
-> [-a] [-x] [-d] [-e] [-D debuglevel] [-n] [-r &#60;remote machine&#62;] [-R &#60;name resolve order&#62;] [-m] [-j DOMAIN] [-U username[%password]] [-h] [-s] [username]</P
+> [-a] [-x] [-d] [-e] [-D debuglevel] [-n] [-r &#60;remote machine&#62;] [-R &#60;name resolve order&#62;] [-m] [-j DOMAIN] [-U username[%password]] [-h] [-s] [-w pass] [username]</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN25"
+NAME="AEN26"
></A
><H2
>DESCRIPTION</H2
@@ -110,7 +110,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN41"
+NAME="AEN42"
></A
><H2
>OPTIONS</H2
@@ -512,6 +512,47 @@ CLASS="COMMAND"
is to aid people writing scripts to drive smbpasswd</P
></DD
><DT
+>-w password</DT
+><DD
+><P
+>This parameter is only available is Samba
+ has been configured to use the experiemental
+ <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option. The <TT
+CLASS="PARAMETER"
+><I
+>-w</I
+></TT
+>
+ switch is used to specify the password to be used with the
+ <A
+HREF="smb.conf.5.html#LDAPADMINDN"
+TARGET="_top"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap admin
+ dn</I
+></TT
+></A
+>. Note that the password is stored in
+ the <TT
+CLASS="FILENAME"
+>private/secrets.tdb</TT
+> and is keyed off
+ of the admin's DN. This means that if the value of <TT
+CLASS="PARAMETER"
+><I
+>ldap
+ admin dn</I
+></TT
+> ever changes, the password will beed to be
+ manually updated as well.
+ </P
+></DD
+><DT
>username</DT
><DD
><P
@@ -529,7 +570,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN171"
+NAME="AEN182"
></A
><H2
>NOTES</H2
@@ -572,7 +613,7 @@ CLASS="FILENAME"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN181"
+NAME="AEN192"
></A
><H2
>VERSION</H2
@@ -583,7 +624,7 @@ NAME="AEN181"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN184"
+NAME="AEN195"
></A
><H2
>SEE ALSO</H2
@@ -606,7 +647,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN190"
+NAME="AEN201"
></A
><H2
>AUTHOR</H2
diff --git a/docs/htmldocs/smbrun.1.html b/docs/htmldocs/smbrun.1.html
new file mode 100644
index 00000000000..95de5bebdf5
--- /dev/null
+++ b/docs/htmldocs/smbrun.1.html
@@ -0,0 +1,215 @@
+<HTML
+><HEAD
+><TITLE
+>smbrun</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><H1
+><A
+NAME="FINDSMB"
+>smbrun</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>smbrun&nbsp;--&nbsp;interface program between smbd and external
+ programs</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><B
+CLASS="COMMAND"
+>smbrun</B
+> {&lt;shell command&gt;}</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN12"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+>This tool is part of the <A
+HREF="samba.7.html"
+TARGET="_top"
+> Samba</A
+> suite.</P
+><P
+><B
+CLASS="COMMAND"
+>smbrun</B
+> is a very small 'glue' program,
+ which runs shell commands for the <A
+HREF="smbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+> smbd(8)</B
+></A
+> daemon.</P
+><P
+>It first changes to the highest effective user and group
+ ID that it can, then runs the command line provided using the
+ system() call. This program is necessary to allow some operating
+ systems to run external programs as non-root.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN21"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>shell command</DT
+><DD
+><P
+>The shell command to execute. The
+ command should have a fully-qualified path.</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN28"
+></A
+><H2
+>ENVIRONMENT VARIABLES</H2
+><P
+>The <TT
+CLASS="PARAMETER"
+><I
+>PATH</I
+></TT
+> variable set for the
+ environment in which <B
+CLASS="COMMAND"
+>smbrun</B
+> is executed will affect
+ what executables are located and executed if a fully-qualified path
+ is not given in the command.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN33"
+></A
+><H2
+>DIAGNOSTICS</H2
+><P
+>If <B
+CLASS="COMMAND"
+>smbrun</B
+> cannot be located or cannot
+ be executed by <A
+HREF="smbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbd(8)</B
+>
+ </A
+>, then appropriate messages will be found in the <B
+CLASS="COMMAND"
+> smbd</B
+> logs. Other diagnostics are dependent on the shell-command
+ being run. It is advisable for your shell commands to issue suitable
+ diagnostics to aid trouble-shooting.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN40"
+></A
+><H2
+>VERSION</H2
+><P
+>This man page is correct for version 2.2 of
+ the Samba suite.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN43"
+></A
+><H2
+>SEE ALSO</H2
+><P
+><A
+HREF="nmbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>nmbd(8)</B
+></A
+>,
+ <A
+HREF="smbclient.1.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbclient(1)
+ </B
+></A
+>, and <A
+HREF="nmblookup.1.html"
+TARGET="_top"
+> <B
+CLASS="COMMAND"
+>nmblookup(1)</B
+></A
+>
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN52"
+></A
+><H2
+>AUTHOR</H2
+><P
+>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</P
+><P
+>The original Samba man pages were written by Karl Auer.
+ The man page sources were converted to YODL format (another
+ excellent piece of Open Source software, available at
+ <A
+HREF="ftp://ftp.icce.rug.nl/pub/unix/"
+TARGET="_top"
+> ftp://ftp.icce.rug.nl/pub/unix/</A
+>) and updated for the Samba 2.0
+ release by Jeremy Allison. The conversion to DocBook for
+ Samba 2.2 was done by Gerald Carter</P
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/docs/htmldocs/using_samba/licenseinfo.html b/docs/htmldocs/using_samba/licenseinfo.html
index 71bc74def8b..7e8962a8325 100644
--- a/docs/htmldocs/using_samba/licenseinfo.html
+++ b/docs/htmldocs/using_samba/licenseinfo.html
@@ -38,8 +38,8 @@ should read:
O'Reilly & Associates. This material may be distributed only
subject to the terms and conditions set forth in the
license, which is presently available at
- <a href="http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html">
- http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html</a>.
+ <a href="http://www.oreilly.com/catalog/samba/licenseinfo.html">
+ http://www.oreilly.com/catalog/samba/licenseinfo.html</a>.
</blockquote>
<p>
For an excerpt, the reference should read:
@@ -50,8 +50,8 @@ For an excerpt, the reference should read:
and published by O'Reilly & Associates. This material may be
distributed only subject to the terms and conditions set
forth in the license, which is presently available at
- <a href="http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html">
- http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html</a>.
+ <a href="http://www.oreilly.com/catalog/samba/licenseinfo.html">
+ http://www.oreilly.com/catalog/samba/licenseinfo.html</a>.
</blockquote>
<p>
Translations must contain similar references in the target
@@ -64,8 +64,8 @@ the following:
published by O'Reilly & Associates. This material may be
distributed only subject to the terms and conditions set
forth in the license, which is presently available at
- <a href="http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html">
- http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html</a>.
+ <a href="http://www.oreilly.com/catalog/samba/licenseinfo.html">
+ http://www.oreilly.com/catalog/samba/licenseinfo.html</a>.
</blockquote>
<p>
Both commercial and noncommercial redistribution of material
diff --git a/docs/htmldocs/using_samba/this_edition.html b/docs/htmldocs/using_samba/this_edition.html
index 839f65737a0..71522ac31e1 100644
--- a/docs/htmldocs/using_samba/this_edition.html
+++ b/docs/htmldocs/using_samba/this_edition.html
@@ -31,8 +31,8 @@ By Robert Eckstein, David Collier-Brown & Peter Kelly
O'Reilly & Associates. This material may be distributed only
subject to the terms and conditions set forth in the
license, which is presently available at
- <a href="http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html">
- http://www.oreilly.com/catalog/samba/chapter/licenseinfo.html</a>.
+ <a href="http://www.oreilly.com/catalog/samba/licenseinfo.html">
+ http://www.oreilly.com/catalog/samba/licenseinfo.html</a>.
</blockquote>
<hr size=1 noshade>
generated by cgit (git 2.34.1) at 2025-10-09 12:25:20 +0000