diff --git a/docs/Makefile b/docs/Makefile index ee719ed0c36..f7f6ed5ff39 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,6 +9,7 @@ include Makefile.settings # Docs to build MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml)) MANPAGES3 = $(wildcard $(MANPAGEDIR3)/*.?.xml) +export TEXINPUTS=xslt/latex:.: # Lists of files to process LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf @@ -74,11 +75,11 @@ validate: $(addsuffix -validate,$(MAIN_DOCS)) # $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) - $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< + $(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< $(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) - $(XSLTPROC) --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< + $(XSLTPROC) --xinclude --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl mkdir -p $(@D) @@ -116,9 +117,9 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html $(HTML2TEXT) -nobs -style pretty -o $@ $< # Tex files -%.tex: $(DOCBOOKDIR)/%.xml xslt/latex.xsl +%.tex: %/index.xml xslt/latex.xsl mkdir -p $(@D) - $(XSLTPROC) --output $@ xslt/latex.xsl $< + $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $< latexfigures: $(LATEX_FIGURES) diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in index c2b9d8aec63..ee67fd11339 100644 --- a/docs/Makefile.settings.in +++ b/docs/Makefile.settings.in @@ -13,8 +13,8 @@ MAKEINFO = @MAKEINFO@ PLUCKERBUILD = @PLUCKERBUILD@ COPY_IMAGES = ./scripts/copy-images.sh THUMBPDF = @THUMBPDF@ -PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style -LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style +PDFLATEX = @PDFLATEX@ --file-line-error-style +LATEX = @LATEX@ --file-line-error-style FOP = @FOP@ RM = @RM@ PERL = @PERL@ diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml index f55fc34f280..feab045ddd4 100644 --- a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml +++ b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml @@ -1049,8 +1049,9 @@ index default sub - + Primary Domain Controller &smb.conf; File &smbmdash; Part A + Global parameters LOCALE @@ -1096,10 +1097,12 @@ index default sub 10000-20000 root cups - + + - + Primary Domain Controller &smb.conf; File &smbmdash; Part B + /tmp @@ -1130,10 +1133,12 @@ index default sub Yes Yes No - + + - + Primary Domain Controller &smb.conf; File &smbmdash; Part C + Application Files /apps @@ -1164,10 +1169,12 @@ index default sub /var/lib/samba/drivers root root, Administrator - + + - + Backup Domain Controller &smb.conf; File &smbmdash; Part A + # Global parameters LOCALE @@ -1211,10 +1218,12 @@ index default sub Financial Services Files /data/service No - + + - + Backup Domain Controller &smb.conf; File &smbmdash; Part B + Property Insurance Files /data/pidata @@ -1256,7 +1265,8 @@ index default sub /var/lib/samba/profdata No Yes - + + Key Points Learned diff --git a/docs/Samba3-ByExample/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml index 1f4e9f70931..b94c8d69e41 100644 --- a/docs/Samba3-ByExample/SBE-500UserNetwork.xml +++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml @@ -948,8 +948,9 @@ hosts: files dns wins - + Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename> + Global parameters MEGANET @@ -987,11 +988,13 @@ hosts: files dns wins Property Insurance Files /data/pidata No - + + - + Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename> + Global parameters /var/lib/samba/scripts/shutdown.sh @@ -1021,11 +1024,13 @@ hosts: files dns wins /var/lib/samba/profiles No Yes - + + - + Common Samba Configuration File: <filename>/etc/samba/common.conf</filename> + /etc/samba/smbusers 1 @@ -1061,31 +1066,37 @@ hosts: files dns wins /apps bjordan No - + + - + Server: BLDG1 (Member), File: smb.conf + Global parameters MEGANET BLDG1 /etc/samba/dom-mem.conf - + + - + Server: BLDG2 (Member), File: smb.conf + Global parameters MEGANET BLDG2 /etc/samba/dom-mem.conf - + + - + Common Domain Member Include File: dom-mem.conf + Global parameters /var/lib/samba/scripts/shutdown.sh @@ -1095,7 +1106,8 @@ hosts: files dns wins 15000-20000 15000-20000 /etc/samba/common.conf - + + diff --git a/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml index 57487916b26..78c76c91eb7 100644 --- a/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml +++ b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml @@ -680,8 +680,9 @@ Join to 'MEGANET2' failed. - + Samba Domain Member in Samba Domain Using LDAP &smbmdash; &smb.conf; File + Global parameters LOCALE @@ -727,7 +728,8 @@ Join to 'MEGANET2' failed. /var/lib/samba/drivers root, Administrator root - + + LDIF IDMAP Add-On Load File &smbmdash; File: /etc/openldap/idmap.LDIF @@ -979,8 +981,9 @@ MEGANET2+PIOps:x:10005: - + Samba Domain Member Server Using Winbind &smb.conf; File for NT4 Domain + Global parameters LOCALE @@ -1022,7 +1025,8 @@ MEGANET2+PIOps:x:10005: /var/lib/samba/drivers root, Administrator root - + + @@ -1071,8 +1075,9 @@ Joined domain MEGANET2. - + Samba Domain Member Server Using Local Accounts &smb.conf; File for NT4 Domain + Global parameters LOCALE @@ -1114,7 +1119,8 @@ Joined domain MEGANET2. /var/lib/samba/drivers root, Administrator root - + + @@ -1672,8 +1678,9 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- May this server serve well all who happen upon it. - + Samba Domain Member &smb.conf; File for Active Directory Membership + Global parameters LOCALE @@ -1713,7 +1720,8 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- /var/lib/samba/drivers root, Administrator root - + + IDMAP_RID with Winbind @@ -1755,8 +1763,9 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- An example &smb.conf; file for an ADS domain environment is shown in . - + Example &smb.conf; File Using <constant>idmap_rid</constant> + Global parameters KPAK @@ -1774,7 +1783,8 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- No Yes "KPAK\Domain Admins" - + + large domain @@ -1876,8 +1886,9 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash The example in is for an ADS-style domain. - + Typical ADS Style Domain &smb.conf; File + Global parameters SNOWSHOW @@ -1894,7 +1905,8 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash 150000-550000 /bin/bash Yes - + + realm @@ -2078,8 +2090,9 @@ Joined 'GOODELF' to realm 'SNOWSHOW.COM' An example &smb.conf; file is shown in . - + ADS Membership Using RFC2307bis Identity Resolution &smb.conf; File + Global parameters BUBBAH @@ -2093,7 +2106,8 @@ Joined 'GOODELF' to realm 'SNOWSHOW.COM' Yes Yes Yes - + + nss_ldap diff --git a/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml b/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml index 49dafda9fa6..4ca9a097a8b 100644 --- a/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml +++ b/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml @@ -581,8 +581,9 @@ password: XXXXXXXX in . - + Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename> + LONDON W2K3S @@ -603,7 +604,8 @@ password: XXXXXXXX yes yes yes - + + NSS Configuration File Extract &smbmdash; File: <filename>/etc/nsswitch.conf</filename> diff --git a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml index 024cfd6643b..a20a8f1633c 100644 --- a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml +++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml @@ -1852,8 +1852,9 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 configuration of the LDAP server. - + LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A + Global parameters LOCALE @@ -1884,10 +1885,12 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 /opt/IDEALX/sbin/ smbldap-usermod -g "%g" "%u" /opt/IDEALX/sbin/smbldap-useradd -w "%u" - + + - + LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part B + scripts\logon.bat \\%L\profiles\%U X: @@ -1906,7 +1909,8 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 Yes cups root, chrisr - + + @@ -3185,8 +3189,9 @@ smb: \> q - + LDAP Based &smb.conf; File, Server: BLDG1 + Global parameters LOCALE @@ -3220,11 +3225,13 @@ smb: \> q 10000-20000 cups root, chrisr - + + - + LDAP Based &smb.conf; File, Server: BLDG2 + Global parameters LOCALE @@ -3258,11 +3265,13 @@ smb: \> q 10000-20000 cups root, chrisr - + + - + LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A + Accounting Files /data/accounts @@ -3290,10 +3299,12 @@ smb: \> q Yes Yes No - + + - + LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B + Application Files /apps @@ -3325,7 +3336,8 @@ smb: \> q no yes root, chrisr - + + LDIF IDMAP Add-On Load File &smbmdash; File: /etc/openldap/idmap.LDIF diff --git a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml index 476d55a0ec0..57328217b2d 100644 --- a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml +++ b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml @@ -399,8 +399,9 @@ no account information can be deleted. - + NT4 Migration Samba-3 Server <filename>smb.conf</filename> &smbmdash; Part: A + DAMNATION MERLIN @@ -446,10 +447,12 @@ Yes Yes Yes - + + - + NT4 Migration Samba-3 Server <filename>smb.conf</filename> &smbmdash; Part: B + Application Data /data/home/apps @@ -491,7 +494,8 @@ Printer Drivers /var/lib/samba/drivers - + + slapd.conf diff --git a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml index 43dee10a322..f823cc67bb0 100644 --- a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml +++ b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml @@ -669,8 +669,9 @@ session: none The Samba &smb.conf; file was configured as shown in . - + Samba Configuration File &smbmdash; smb.conf Part A + Global parameters MEGANET2 @@ -712,10 +713,12 @@ session: none root, "@Domain Admins" "@Domain Admins" Yes - + + - + Samba Configuration File &smbmdash; smb.conf Part B + Network logon service /data/samba/netlogon @@ -754,10 +757,12 @@ session: none Location of documents printed to PDFCreator printer /data/samba/shares/pdf Yes - + + - + Samba Configuration File &smbmdash; smb.conf Part C + All shares /data/samba @@ -798,10 +803,12 @@ session: none Yes Yes printers - + + - + Samba Configuration File &smbmdash; smb.conf Part D + /data/samba/shares/Apps "Domain Users" @@ -839,10 +846,12 @@ session: none No 0770 engr - + + - + Samba Configuration File &smbmdash; smb.conf Part E + /data/samba/shares/X @engr, @acct @@ -867,7 +876,8 @@ session: none chad No No - + + Qbasic diff --git a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml index 6e8a5c85a14..00d76703360 100644 --- a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml +++ b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml @@ -804,8 +804,9 @@ echo -e "\nNAT firewall done.\n" and . Concatenate (join) all three files to make a single &smb.conf; file. The final, fully qualified path for this file should be /etc/samba/smb.conf. - + 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section + Global parameters PROMISES @@ -849,10 +850,12 @@ echo -e "\nNAT firewall done.\n" Raw /*.eml/*.nws/*.{*}/ /*.doc/*.xls/*.mdb/ - + + - + 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A + Home Directories %S @@ -884,10 +887,12 @@ echo -e "\nNAT firewall done.\n" Accounting Files /data/accounts No - + + - + 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B + Financial Services Files /data/service @@ -903,7 +908,8 @@ echo -e "\nNAT firewall done.\n" /apps Yes bjordan - + + diff --git a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml index 1213caf2d1c..1c41ec98111 100644 --- a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml +++ b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml @@ -186,8 +186,9 @@ Install the &smb.conf; file shown in in the /etc/samba directory. - + Drafting Office &smb.conf; File + Global Parameters MIDEARTH @@ -197,7 +198,8 @@ /plans Yes Yes - + + @@ -642,8 +644,9 @@ application/octet-stream - + Charity Administration Office &smb.conf; New-style File + Global Parameters - Newer Configuration MIDEARTH @@ -678,10 +681,12 @@ application/octet-stream Yes Yes No - + + - + Charity Administration Office &smb.conf; Old-style File + Global Parameters - Older Style Configuration MIDEARTH @@ -717,7 +722,8 @@ application/octet-stream Yes Yes No - + + Windows Client Configuration @@ -1278,8 +1284,9 @@ application/octet-stream - + Accounting Office Network &smb.conf; Old Style Configuration File + Global parameters BILLMORE @@ -1306,7 +1313,8 @@ application/octet-stream Yes Yes No - + + diff --git a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml index 7b6f9f76004..037881c33fd 100644 --- a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml +++ b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml @@ -630,8 +630,9 @@ hosts: files wins - + Accounting Office Network &smb.conf; File &smbmdash; [globals] Section + Global parameters BILLMORE @@ -656,10 +657,12 @@ hosts: files wins Yes Yes CUPS - + + - + Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section + Home Directories %S @@ -691,7 +694,8 @@ hosts: files wins /data/finsvcs %G No - + + Validation diff --git a/docs/Samba3-HOWTO/TOSHARG-BDC.xml b/docs/Samba3-HOWTO/TOSHARG-BDC.xml index 7d4ff18dd77..c553950f76c 100644 --- a/docs/Samba3-HOWTO/TOSHARG-BDC.xml +++ b/docs/Samba3-HOWTO/TOSHARG-BDC.xml @@ -251,13 +251,15 @@ parameters in the -section of the &smb.conf; ha Refer to following configuration for an example of the minimum required settings. - + Minimal smb.conf for a PDC in Use With a BDC &smbmdash; LDAP Server on PDC. + &example.workgroup; ldapsam://localhost:389 yes yes - + + Several other things like a and a @@ -341,15 +343,15 @@ In order to have a fall-back configuration (secondary) LDAP server one would spe the secondary LDAP server in the &smb.conf; file as shown in following example. - - + Multiple LDAP Servers in &smb.conf; + ... ldapsam:"ldap://master.quenya.org ldap://slave.quenya.org" ... - - + + @@ -509,14 +511,16 @@ The creation of a BDC requires some steps to prepare the Samba server before done by setting Samba as shown in the next example. - + Minimal setup for being a BDC + &example.workgroup; ldapsam:ldap://slave-ldap.quenya.org no yes ldap:ldap://slave-ldap.quenya.org - + + In the -section of the &smb.conf; of the BDC. This makes the BDC diff --git a/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml index cd96ba60abc..12f797c84a4 100644 --- a/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml +++ b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml @@ -156,8 +156,9 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) To summarize, following example shows simplest printing-related setup for &smb.conf; to enable basic CUPS support: - + Simplest printing-related smb.conf + yes cups @@ -173,7 +174,8 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) yes root, @ntadmins - + + This is all you need for basic printing setup for CUPS. It will print @@ -203,8 +205,9 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) up differently. - + Overriding global CUPS settings for one printer + cups cups @@ -235,7 +238,8 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) kurt 0.0.0.0 turbo_xp, 10.160.50.23, 10.160.51.60 - + + This special share is only there for testing purposes. It does not write the print job to a file. It just logs the job parameters @@ -2475,8 +2479,9 @@ Prior to running cupsaddsmb, you need the settings in &smb.conf; as shown in the next example: - + smb.conf for cupsaddsmb usage + yes cups @@ -2499,7 +2504,8 @@ Prior to running cupsaddsmb, you need the settings in no yes root - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Diagnosis.xml b/docs/Samba3-HOWTO/TOSHARG-Diagnosis.xml index 9f4f3dd2c05..6b844dc17e5 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Diagnosis.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Diagnosis.xml @@ -55,14 +55,15 @@ You can add a share like this by adding the lines shown in the next example. - -smb.conf with [tmp] share + + smb.conf with [tmp] share + temporary files /tmp yes - - + + These tests assume version 3.0.0 or later of the Samba suite. @@ -239,18 +240,16 @@ the &smb.conf; file entries as shown in the next example< - - + Configuration for only allowing connections from a certain subnet + -... ALL xxx.xxx.xxx.xxx/yy eth0 Yes -... - - + + In the above, no allowance has been made for any session requests that @@ -258,17 +257,15 @@ will automatically translate to the loopback adapter address 127.0.0.1. To solve this problem, change these lines as shown in the following example. - - + Configuration for allowing connections from a certain subnet and localhost + -... ALL xxx.xxx.xxx.xxx/yy 127. eth0 lo -... - - + + inetd diff --git a/docs/Samba3-HOWTO/TOSHARG-FastStart.xml b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml index 5395f690706..108c787d640 100644 --- a/docs/Samba3-HOWTO/TOSHARG-FastStart.xml +++ b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml @@ -139,8 +139,9 @@ of the packages that are provided by the operating system vendor, or through oth The configuration file is: - + Anonymous Read-Only Server Configuration + Global parameters MIDEARTH @@ -152,8 +153,8 @@ of the packages that are provided by the operating system vendor, or through oth /export Yes Yes - - + + @@ -274,8 +275,8 @@ Added user jackb. The complete, modified &smb.conf; file is as shown in . - -Modified Anonymous Read-Write smb.conf +Modified Anonymous Read-Write smb.conf + Global parameters MIDEARTH @@ -289,8 +290,8 @@ Added user jackb. users No Yes - - + + @@ -327,8 +328,8 @@ Added user jackb. configuration. is the resulting &smb.conf; file. - -Anonymous Print Server smb.conf +Anonymous Print Server smb.conf + Global parameters MIDEARTH @@ -346,8 +347,8 @@ Added user jackb. Yes Yes No - - + + The above configuration is not ideal. It uses no smart features, and it deliberately @@ -449,8 +450,10 @@ Added user jackb. Configure the Samba &smb.conf; file as shown in . - -Secure Office Server smb.conf + + + Secure Office Server smb.conf + Global parameters MIDEARTH @@ -483,8 +486,8 @@ Added user jackb. Yes Yes No - - + + Initialize the Microsoft Windows password database with the new users: @@ -663,9 +666,9 @@ smb: \> q and . - - + Member server smb.conf (globals) + Global parameters MIDEARTH @@ -678,11 +681,11 @@ smb: \> q 15000-20000 Yes cups - + - - + Member server smb.conf (shares and services) + Home Directories %S @@ -710,8 +713,8 @@ smb: \> q Yes Yes No - - + + @@ -892,8 +895,9 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false pdbedit - + Engineering Office smb.conf (globals) + MIDEARTH FRODO @@ -920,10 +924,13 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false 15000-20000 15000-20000 cups - + + + - + Engineering Office smb.conf (shares and services) + Home Directories %S @@ -963,8 +970,8 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false Yes Other resource (share/printer) definitions would follow below. - - + + Create UNIX group accounts as needed using a suitable operating system tool: @@ -1156,9 +1163,9 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb The &smb.conf; file that drives this backend can be found in example . - - + LDAP backend smb.conf for PDC + Global parameters MIDEARTH @@ -1193,8 +1200,8 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb 15000-20000 15000-20000 cups - - + + Add the LDAP password to the secrets.tdb file so Samba can update @@ -1226,8 +1233,10 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb Decide if the BDC should have its own LDAP server or not. If the BDC is to be the LDAP server change the following &smb.conf; as indicated. The default configuration in uses a central LDAP server. - + + Remote LDAP BDC smb.conf + Global parameters MIDEARTH @@ -1254,8 +1263,8 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb 15000-20000 15000-20000 cups - - + + Configure the NETLOGON and PROFILES directory as for the PDC in . diff --git a/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml index b0e1a8cf48c..a2625edb773 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml @@ -642,11 +642,13 @@ exit 0 The &smb.conf; entry for the above script would be something like that in the following example. - + Configuration of &smb.conf; for the add group script. + /path_to_tool/smbgrpadd.sh "%g" - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Install.xml b/docs/Samba3-HOWTO/TOSHARG-Install.xml index 1cec899cdde..1d9445e50b6 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Install.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Install.xml @@ -61,8 +61,9 @@ minimal configuration - + A minimal smb.conf + WKG @@ -73,7 +74,8 @@ /my_shared_folder Some random files - + + @@ -149,15 +151,17 @@ simple configuration - + Another simple smb.conf File + &example.workgroup; no no - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml index dbbaac7b085..e9f39414d56 100644 --- a/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml +++ b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml @@ -624,16 +624,16 @@ options in the section of the &smb.conf; file as shown in the following example: - - + Domain Master Browser smb.conf + yes yes yes 65 - - + + The Domain Master Browser may be the same machine as the WINS server, if necessary. @@ -649,16 +649,16 @@ server a Local Master Browser set the following options in the shown in following example: - - + Local master browser smb.conf + no yes yes 65 - - + + Do not do this for more than one Samba server on each subnet, or they will war with @@ -678,16 +678,16 @@ becoming a Local Master Browser by setting the following options in the following example: - - + smb.conf for not being a Master Browser + no no no 0 - - + + @@ -707,16 +707,16 @@ described. To make a Samba server a Local Master Browser, set the following opti of the &smb.conf; file as shown in following example: - - + Local Master Browser smb.conf + no yes yes 65 - - + + If you wish to have a Samba server fight the election with machines on the same subnet you @@ -732,16 +732,16 @@ and ever becoming a Local Master Browser by setting the following options in the section of the &smb.conf; file as shown in next example: - - + &smb.conf; for not being a master browser + no no no 0 - - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml b/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml index 0a0d78fd919..61f100f7c6d 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml @@ -308,15 +308,17 @@ releases prior to Samba 2.2.2. Following example provides a minimal profile share. - + Minimal profile share + /export/profile 0600 0700 no no - + + The reason for this bug is that the Windows 200x SP2 client copies diff --git a/docs/Samba3-HOWTO/TOSHARG-PDC.xml b/docs/Samba3-HOWTO/TOSHARG-PDC.xml index 595deaa0ca6..e28de99470d 100644 --- a/docs/Samba3-HOWTO/TOSHARG-PDC.xml +++ b/docs/Samba3-HOWTO/TOSHARG-PDC.xml @@ -426,9 +426,9 @@ The first step in creating a working Samba PDC is to understand the parameters n in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in the next example. - - + smb.conf for being a PDC + BELERIAND &example.workgroup; @@ -454,8 +454,8 @@ in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in no 0600 0700 - - + + The basic options shown in this example are explained as follows: @@ -582,8 +582,9 @@ must be set. Example Configuration - + smb.conf for being a PDC + Yes (Yes on PDC, No on BDCs) @@ -593,7 +594,8 @@ must be set. /var/lib/samba/netlogon Yes No - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml index 45077188e8d..00ac479e2bd 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml @@ -418,13 +418,15 @@ Samba-3 introduces a number of new password backend capabilities. SAM backendldapsam - + Example configuration with the LDAP idmap backend + ldap:ldap://ldap-server.quenya.org:636 Alternately, this could be specified as: ldap:ldaps://ldap-server.quenya.org - + + @@ -1148,9 +1150,9 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz use with an LDAP directory could appear as shown below. - - + Configuration with LDAP + user yes @@ -1190,8 +1192,8 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz generally the default ldap search filter is ok (uid=%u) - - + + @@ -1634,8 +1636,9 @@ access to attrs=SambaLMPassword,SambaNTPassword An example configuration looks like: - + Example configuration for the MySQL passdb backend + mysql:foo samba @@ -1650,7 +1653,8 @@ access to attrs=SambaLMPassword,SambaNTPassword nt_pass: The unknown 3 column is not stored NULL - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Printing.xml b/docs/Samba3-HOWTO/TOSHARG-Printing.xml index 349d64f7f9a..b5488fca652 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Printing.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Printing.xml @@ -186,9 +186,9 @@ However, in many environments these are enough to provide a valid &smb.conf; file that enables all clients to print. - - + Simple configuration with BSD printing + bsd yes @@ -198,7 +198,8 @@ However, in many environments these are enough to provide a valid yes yes no - + + This is only an example configuration. Samba assigns default values to @@ -446,8 +447,9 @@ by default. You could use a much leaner &smb.conf; file. Alternately, you can us file to remove all parameters that are set at default. - + Extended BSD Printing Configuration + bsd yes @@ -478,7 +480,7 @@ file to remove all parameters that are set at default. 0.0.0.0 turbo_xp, 10.160.50.23, 10.160.51.60 no - + This is an example configuration. You may not find all the settings that are in @@ -1141,9 +1143,9 @@ as are arbitrary and should be replaced with approp site). See next example. - - + [print\$] example + members of the ntadmin group should be able to add drivers and set printer properties. root is implicitly always a 'printer admin'. @@ -1158,8 +1160,8 @@ site). See next example. yes yes @ntadmin, root - - + + Of course, you also need to ensure that the directory named by the diff --git a/docs/Samba3-HOWTO/TOSHARG-StandAloneServer.xml b/docs/Samba3-HOWTO/TOSHARG-StandAloneServer.xml index ad1b69e79e5..c1874d0e493 100644 --- a/docs/Samba3-HOWTO/TOSHARG-StandAloneServer.xml +++ b/docs/Samba3-HOWTO/TOSHARG-StandAloneServer.xml @@ -102,8 +102,9 @@ nobody. No home directories are shared, and there are no users in the UNIX system database. This is a simple system to administer. - + smb.conf for Reference Documentation Server + Global parameters &example.workgroup; @@ -115,7 +116,8 @@ UNIX system database. This is a simple system to administer. Data /export Yes - + + In the example above, the machine name is set to &example.server.samba;, the workgroup is set to the name @@ -193,9 +195,9 @@ the anonymous (guest) user, two things will be required: The contents of the &smb.conf; file is shown in the next example. - - + &smb.conf; for Anonymous Printing + Global parameters &example.workgroup; @@ -213,8 +215,8 @@ The contents of the &smb.conf; file is shown in the n Yes Yes No - - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Unicode.xml b/docs/Samba3-HOWTO/TOSHARG-Unicode.xml index a858a38508c..761116c8181 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Unicode.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Unicode.xml @@ -374,7 +374,8 @@ Setting up Japanese charsets is quite difficult. This is mainly because: as follows: -VFS CAP +VFS CAP + the locale name "CP932" may be different CP932 @@ -382,7 +383,8 @@ Setting up Japanese charsets is quite difficult. This is mainly because: cap - + + You should set CP932 if using GNU libiconv for unix charset. Setting this, diff --git a/docs/Samba3-HOWTO/TOSHARG-VFS.xml b/docs/Samba3-HOWTO/TOSHARG-VFS.xml index 3fdcc0ea811..0ccc1188fe2 100644 --- a/docs/Samba3-HOWTO/TOSHARG-VFS.xml +++ b/docs/Samba3-HOWTO/TOSHARG-VFS.xml @@ -40,15 +40,17 @@ important parameter is the parameter where you can list one or more VFS modules by name. For example, to log all access to files and put deleted files in a recycle bin, see next configuration: - + smb.conf with VFS modules + Audited /data directory /data audit recycle yes yes - + + @@ -70,8 +72,9 @@ Samba installation (usually /usr/lib/samba/vfs or the following example. - + smb.conf with multiple VFS modules + VFS TEST /data @@ -81,7 +84,8 @@ This can be done using a configuration similar to the one shown in 1 5 7 - + + @@ -502,17 +506,17 @@ This can be done using a configuration similar to the one shown in - - + Share With shadow_copy VFS + Shadow Copy Enabled Share /data/shadow_share shadow_copy yes yes - - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-Winbind.xml b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml index 6cec77528da..9429d51a81a 100644 --- a/docs/Samba3-HOWTO/TOSHARG-Winbind.xml +++ b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml @@ -619,9 +619,9 @@ are described in more detail in the winbinddthe next example, was modified to include the necessary entries in the [global] section. - - + smb.conf for Winbind set-up + separate domain and username with '\', like DOMAIN\username \ @@ -635,7 +635,8 @@ linkend="winbindcfg">the next example, was modified to include the necess give winbind users a real shell (only needed if they have telnet access) /home/winnt/%D/%U /bin/bash - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml index 2d8b78536e7..3c294406ac7 100644 --- a/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml +++ b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml @@ -224,7 +224,7 @@ that are in common use today. These are: Click the WINS tab to add manual WINS server entries. This step demonstrates an example system that uses manually configured WINS settings. When finished making changes, click on OK to commit the settings. - See . + See .
WINS Configuration.w2kp005
 @@ -255,16 +255,16 @@ that are in common use today. These are: In the box labeled The following network components are installed:, - click on Internet Protocol TCP/IP, now click on the Properties button. See . + click on Internet Protocol TCP/IP, now click on the Properties button. See .
The Windows Me Network Configuration Panel.WME001
 Many network administrators will want to use DHCP to configure all client TCP/IP protocol stack settings. (For information on how to configure the ISC DHCP server - for Microsoft Windows client support see, . + for Microsoft Windows client support see, . The default setting on Microsoft Windows Me workstations is for DHCP enabled operation, - i.e., Obtain IP address automatically is enabled. See . + i.e., Obtain IP address automatically is enabled. See .
IP Address.WME002
 @@ -286,7 +286,7 @@ that are in common use today. These are: - The following example uses manually configured WINS settings. See . + The following example uses manually configured WINS settings. See . When finished making changes, click on OK to commit the settings.
DNS Configuration.WME005
 diff --git a/docs/Samba3-HOWTO/TOSHARG-locking.xml b/docs/Samba3-HOWTO/TOSHARG-locking.xml index 2aa6b622a24..cb228658e7c 100644 --- a/docs/Samba3-HOWTO/TOSHARG-locking.xml +++ b/docs/Samba3-HOWTO/TOSHARG-locking.xml @@ -666,16 +666,16 @@ enabled on a per-share basis, or globally for the entire server, in the &smb.conf; file as shown in . - - + Share with some files oplocked + /filename.htm/*.txt/ /*.exe/filename.ext/ - - + + is an &smb.conf; parameter @@ -699,16 +699,16 @@ Oplock break Contention Limit can be enable on a per-share basis, or globally fo the entire server, in the &smb.conf; file as shown in . - - + Configuration with oplock break contention limit + 2 (default) 2 (default) - - + + diff --git a/docs/Samba3-HOWTO/TOSHARG-msdfs.xml b/docs/Samba3-HOWTO/TOSHARG-msdfs.xml index 126edd0eb66..f5d066e6815 100644 --- a/docs/Samba3-HOWTO/TOSHARG-msdfs.xml +++ b/docs/Samba3-HOWTO/TOSHARG-msdfs.xml @@ -61,9 +61,9 @@ - - + smb.conf with DFS configured + &example.server.samba; yes @@ -71,8 +71,8 @@ /export/dfsroot yes - - + + You should set up the permissions and ownership of the directory acting as the DFS root so that only designated diff --git a/docs/configure.in b/docs/configure.in index 0014ce9583a..a6d975494e8 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -20,12 +20,6 @@ AC_ARG_WITH(papersize, [ --with-papersize Specify papersize (a4paper,letter) ], [ test "$withval" && PAPERSIZE="$withval" ]) -FONTSIZE="10.5" - -AC_ARG_WITH(fontsize, -[ --with-fontsize Specify the fontsize in points (default: 10.5) ], -[ test "$withval" && FONTSIZE="$withval" ]) - AC_ARG_ENABLE(printable, [ --enable-printable Printable output (expand ulinks, etc)], [ if test "$enableval"; then @@ -39,7 +33,6 @@ AC_SUBST(DOC_BUILD_DATE) AC_SUBST(PAPERSIZE) AC_SUBST(ULINK_IN_FOOTNOTE) AC_SUBST(ULINK_SHOW) -AC_SUBST(FONTSIZE) AC_SUBST(DOCROP) AC_SUBST(SAMBASOURCEDIR) diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml index ad9e3fbe97d..3f36eaf9f04 100644 --- a/docs/manpages-3/smb.conf.5.xml +++ b/docs/manpages-3/smb.conf.5.xml @@ -103,11 +103,11 @@ The user has write access to the path /home/bar. The share is accessed via the share name foo: - + /home/bar read only = no - + The following sample section defines a printable share. The share is read-only, but printable. That is, the only write @@ -116,13 +116,13 @@ access will be permitted as the default guest user (specified elsewhere): - + /usr/spool/public yes yes yes - + @@ -186,10 +186,10 @@ than others. The following is a typical and suitable [homes] section: - + no - + An important point is that if guest access is specified in the [homes] section, all home directories will be @@ -248,12 +248,12 @@ it. A typical [printers] entry looks like this: - + /usr/spool/public yes yes - + All aliases given for a printer in the printcap file are legitimate printer names as far as the server is concerned. diff --git a/docs/settings.xsl.in b/docs/settings.xsl.in index a5be3316357..f9deddf4388 100644 --- a/docs/settings.xsl.in +++ b/docs/settings.xsl.in @@ -6,5 +6,4 @@ @DOCROP@ @ULINK_IN_FOOTNOTE@ @ULINK_SHOW@ -@FONTSIZE@ diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 5ded8c703b1..37e70cca5ae 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -22,7 +22,7 @@ - + @@ -31,9 +31,6 @@ - - <?latex \hspace{1cm} ?> - @@ -45,17 +42,14 @@ - - - <?latex \hspace{1cm} ?> - + # - + @@ -105,35 +99,6 @@ - - - - - Warning: smbconfexample does not have title! - - - - - - - - - - - - - - - - - - - - - - - - @@ -146,32 +111,8 @@ - - # - - - - - latex - - - images/ - - - - - - - - 50 - - - - 1 - - html diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl index ac9d2fe423f..cc817427de2 100644 --- a/docs/xslt/latex.xsl +++ b/docs/xslt/latex.xsl @@ -59,8 +59,66 @@ {\bfseries } -xslt/latex/sambadoc -pt,openright,twoside +sambadoc +openright,twoside english + + + + = + + + + + + + # + + + + + + + + + + + \smbconfoption{ + + } + + + + = + + + + + + + \begin{lstlisting}[language=smbconf] + + \end{lstlisting} + + + + \smbconfsection{ + + } + + + + \includegraphics[scale=. + + + + 50 + + ]{ + images/ + + } + + diff --git a/docs/xslt/latex/sambadoc.cls b/docs/xslt/latex/sambadoc.cls index c80f143caf8..fcd693e0caf 100644 --- a/docs/xslt/latex/sambadoc.cls +++ b/docs/xslt/latex/sambadoc.cls @@ -268,6 +268,19 @@ \plainfootrulewidth 0pt %---- no foot rule for chapter page \footrulewidth 0pt %---- no rule for foot + +%10.5pt fonts +\usepackage{type1cm} +\renewcommand\normalsize{% + \@setfontsize\normalsize{10.5pt}{12pt} + \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ + \abovedisplayshortskip \z@ \@plus3\p@ + \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@ + \belowdisplayskip \abovedisplayskip +\let\@listi\@listI} +\normalsize +% + %--- Redefine Headers \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} % @@ -476,7 +489,7 @@ page \thepage \space undefined}}% \renewcommand{\topfraction}{1.0} \renewcommand{\bottomfraction}{1.0} -\usepackage[twoside,dvips]{geometry} +\usepackage[twoside]{geometry} \geometry{% paperwidth=7in, @@ -493,3 +506,15 @@ headsep=.25in, footskip=.025in} \setlength{\headwidth}{\textwidth} + +% smb.conf syntax highlighting +\usepackage{listings} +\usepackage{xcolor} + +\lstdefinelanguage{smbconf}{ + morecomment=[l]{\#}, +} + +\lstset{backgroundcolor=\color{lightgray},frame=single,} +\newcommand{\smbconfsection}[1]{\emph{#1}} +\newcommand{\smbconfoption}[1]{\index{#1}\emph{#1}} diff --git a/docs/xslt/sambadoc2pearson.xsl b/docs/xslt/sambadoc2pearson.xsl index 5028d050642..d7124193755 100644 --- a/docs/xslt/sambadoc2pearson.xsl +++ b/docs/xslt/sambadoc2pearson.xsl @@ -13,29 +13,15 @@ - + - + = - - - - - - - - - - - - - - @@ -60,13 +46,13 @@ - + # - + - Encountered <member> element inside of smbconfexample/smbconfblock! + Encountered <member> element inside of smbconfblock!