From c97b78b4452ef39ffe28a1427f6f555248a70a1c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Mar 2005 18:25:08 +0000 Subject: More validation fixes; building FO-PDF versions of the HOWTO and the Guide work now! (This used to be commit 2192c44663d3031cd6c0f228aea4a8cdd2a29a82) --- docs/Samba-Guide/Chap02-SimpleOfficeServer.xml | 22 ++++++------ docs/Samba-Guide/Chap03-TheSmallOffice.xml | 14 ++++---- docs/Samba-Guide/Chap04-SecureOfficeServer.xml | 20 +++++------ docs/Samba-Guide/Chap05-500UserNetwork.xml | 32 ++++++++--------- docs/Samba-Guide/Chap06-MakingHappyUsers.xml | 28 +++++++-------- docs/Samba-Guide/Chap07-2000UserNetwork.xml | 46 ++++++++++++------------ docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml | 48 +++++++++++++------------- docs/Samba-Guide/Chap09-AddingUNIXClients.xml | 26 +++++++------- docs/Samba-Guide/Chap10-KerberosFastStart.xml | 6 ++-- docs/Samba-Guide/Chap10b-DomainAppsSupport.xml | 4 +-- docs/Samba-Guide/index.xml | 1 - 11 files changed, 123 insertions(+), 124 deletions(-) (limited to 'docs/Samba-Guide') diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml index a22b3825e3..66ffae6eb7 100644 --- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml +++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml @@ -1,5 +1,5 @@ - + No Frills Samba Servers @@ -192,11 +192,11 @@ Drafting Office &smb.conf; File Global Parameters -[global] + MIDEARTH SHARE -[Plans] + /plans Yes Yes @@ -669,7 +669,7 @@ application/octet-stream Charity Administration Office &smb.conf; File Global Parameters -[global] + MIDEARTH SHARE CUPS @@ -678,7 +678,7 @@ application/octet-stream No yes -[FTMFILES] + Funds Tracking & Management Files /data/ftmfiles No @@ -687,7 +687,7 @@ application/octet-stream Yes No -[office] + General Office Files /data/officefiles No @@ -696,7 +696,7 @@ application/octet-stream Yes No -[printers] + Print Temporary Spool Configuration /var/spool/samba Yes @@ -1282,26 +1282,26 @@ application/octet-stream Accounting Office Network &smb.conf; File Global parameters -[global] + BILLMORE CUPS CUPS Yes No -[files] + Work area files /data/%U %S No -[master] + Master work area files /data alan No -[printers] + Print Temporary Spool Configuration /var/spool/samba Yes diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml index 4b007acde2..fde9d71c1d 100644 --- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml +++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml @@ -1,5 +1,5 @@ - + Small Office Networking @@ -642,7 +642,7 @@ hosts: files wins Accounting Office Network &smb.conf; File &smbmdash; [globals] Section Global parameters -[global] + BILLMORE *New*Password* \ %n\n*Re-enter*new*password* %n\n *Password*changed* @@ -669,13 +669,13 @@ hosts: files wins Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes @@ -683,19 +683,19 @@ hosts: files wins Yes No -[netlogon] + Network Logon Service /data/%U %S No -[accounts] + Accounting Files /data/accounts %G No -[finsvcs] + Financial Service Files /data/finsvcs %G diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml index acbb25d03f..1ea6df9d2a 100644 --- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml +++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml @@ -1,5 +1,5 @@ - + Secure Office Networking @@ -862,7 +862,7 @@ echo -e "\nNAT firewall done.\n" 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section Global parameters -[global] + PROMISES DIAMOND eth1, eth2, lo @@ -907,18 +907,18 @@ echo -e "\nNAT firewall done.\n" 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A -[IPC$] + /tmp 192.168.1.0/24, 192.168.2.0/24, 127.0.0.1 0.0.0.0/0 -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes @@ -927,7 +927,7 @@ echo -e "\nNAT firewall done.\n" Yes No -[netlogon] + Network Logon Service /var/lib/samba/netlogon Yes @@ -936,23 +936,23 @@ echo -e "\nNAT firewall done.\n" 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B -[profiles] + Profile Share /var/lib/samba/profiles No Yes -[accounts] + Accounting Files /data/accounts No -[service] + Financial Services Files /data/service No -[apps] + Application Files /apps Yes diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml index b904d64393..74645bccb7 100644 --- a/docs/Samba-Guide/Chap05-500UserNetwork.xml +++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml @@ -1,5 +1,5 @@ - + The 500-User Office @@ -938,7 +938,7 @@ hosts: files dns wins Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename> Global parameters -[global] + MEGANET MASSIVE eth1, lo @@ -955,22 +955,22 @@ hosts: files dns wins Yes /etc/samba/dc-common.conf -[IPC$] + /tmp 172.16.0.0/16, 127.0.0.1 0.0.0.0/0 -[accounts] + Accounting Files /data/accounts No -[service] + Financial Services Files /data/service No -[pidata] + Property Insurance Files /data/pidata No @@ -980,7 +980,7 @@ hosts: files dns wins Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename> Global parameters -[global] + /var/lib/samba/scripts/shutdown.sh /sbin/shutdown -c scripts\logon.bat @@ -991,19 +991,19 @@ hosts: files dns wins Yes /etc/samba/common.conf -[homes] + Home Directories %S No No -[netlogon] + Network Logon Service /var/lib/samba/netlogon Yes No -[profiles] + Profile Share /var/lib/samba/profiles No @@ -1013,7 +1013,7 @@ hosts: files dns wins Common Samba Configuration File: <filename>/etc/samba/common.conf</filename> -[global] + /etc/samba/smbusers 1 0 @@ -1034,7 +1034,7 @@ hosts: files dns wins Share and Service Definitions are common to all servers -[printers] + SMB Print Spool /var/spool/samba Yes @@ -1043,7 +1043,7 @@ hosts: files dns wins Yes No -[apps] + Application Files /apps bjordan @@ -1054,7 +1054,7 @@ hosts: files dns wins Server: BLDG1 (Member), File: smb.conf Global parameters -[global] + MEGANET BLDG1 /etc/samba/dom-mem.conf @@ -1064,7 +1064,7 @@ hosts: files dns wins Server: BLDG2 (Member), File: smb.conf Global parameters -[global] + MEGANET BLDG2 /etc/samba/dom-mem.conf @@ -1074,7 +1074,7 @@ hosts: files dns wins Common Domain Member Include File: dom-mem.conf Global parameters -[global] + /var/lib/samba/scripts/shutdown.sh /sbin/shutdown -c Yes diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml index 55da147007..780f343b1d 100644 --- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml +++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml @@ -1,5 +1,5 @@ - + Making Happy Users @@ -1847,7 +1847,7 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A Global parameters -[global] + LOCALE MEGANET2 MASSIVE @@ -3206,7 +3206,7 @@ smb: \> q LDAP Based &smb.conf; File, Server: BLDG1 Global parameters -[global] + LOCALE MEGANET2 BLDG1 @@ -3244,7 +3244,7 @@ smb: \> q LDAP Based &smb.conf; File, Server: BLDG2 Global parameters -[global] + LOCALE MEGANET2 BLDG2 @@ -3281,28 +3281,28 @@ smb: \> q LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A -[accounts] + Accounting Files /data/accounts No -[service] + Financial Services Files /data/service No -[pidata] + Property Insurance Files /data/pidata No -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes @@ -3312,31 +3312,31 @@ smb: \> q LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B -[apps] + Application Files /apps bjordan No -[netlogon] + Network Logon Service /var/lib/samba/netlogon Yes No -[profiles] + Profile Share /var/lib/samba/profiles No Yes -[profdata] + Profile Data Share /var/lib/samba/profdata No Yes -[print$] + Printer Drivers /var/lib/samba/drivers yes diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml index c349fa3ef7..5b036b5219 100644 --- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml +++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml @@ -1,5 +1,5 @@ - + A Distributed 2000 User Network @@ -1151,7 +1151,7 @@ index default sub Primary Domain Controller &smb.conf; File &smbmdash; Part A Global parameters -[global] + LOCALE MEGANET2 ldapsam:ldap://massive.abmas.biz @@ -1199,31 +1199,31 @@ index default sub Primary Domain Controller &smb.conf; File &smbmdash; Part B -[IPC$] + /tmp -[accounts] + Accounting Files /data/accounts No -[service] + Financial Services Files /data/service No -[pidata] + Property Insurance Files /data/pidata No -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes @@ -1233,32 +1233,32 @@ index default sub Primary Domain Controller &smb.conf; File &smbmdash; Part C -[apps] + Application Files /apps bjones No -[netlogon] + Network Logon Service /var/lib/samba/netlogon root, Administrator Yes No -[profiles] + Profile Share /var/lib/samba/profiles No Yes -[profdata] + Profile Data Share /var/lib/samba/profdata No Yes -[print$] + Printer Drivers /var/lib/samba/drivers root @@ -1268,7 +1268,7 @@ index default sub Backup Domain Controller &smb.conf; File &smbmdash; Part A # Global parameters -[global] + LOCALE MEGANET2 BLDG1 @@ -1301,12 +1301,12 @@ index default sub 10000-20000 cups -[accounts] + Accounting Files /data/accounts No -[service] + Financial Services Files /data/service No @@ -1314,43 +1314,43 @@ index default sub Backup Domain Controller &smb.conf; File &smbmdash; Part B -[pidata] + Property Insurance Files /data/pidata No -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes Yes No -[apps] + Application Files /apps bjones No -[netlogon] + Network Logon Service /var/lib/samba/netlogon Yes No -[profiles] + Profile Share /var/lib/samba/profiles No Yes -[profdata] + Profile Data Share /var/lib/samba/profdata No diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml index 63994d84e8..3b4bedee8f 100644 --- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml +++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml @@ -1,5 +1,5 @@ - + Migrating NetWare 4.11 Server to Samba-3 @@ -532,7 +532,7 @@ shadow: files ldap Samba Configuration File &smbmdash; smb.conf Part A Global parameters -[global] + MEGANET2 MASSIVE Corp File Server @@ -575,13 +575,13 @@ shadow: files ldap Samba Configuration File &smbmdash; smb.conf Part B -[netlogon] + Network logon service /data/samba/netlogon "@Domain Admins" Yes -[profiles] + Roaming Profile Share /data/samba/profiles/ No @@ -589,7 +589,7 @@ shadow: files ldap desktop.ini No -[homes] + Home Directories %S No @@ -598,18 +598,18 @@ shadow: files ldap desktop.ini No -[software] + Software for %a computers /data/samba/shares/software/%a Yes -[public] + Public Files /data/samba/shares/public No Yes -[PDF] + Location of documents printed to PDFCreator printer /data/samba/shares/pdf Yes @@ -617,31 +617,31 @@ shadow: files ldap Samba Configuration File &smbmdash; smb.conf Part C -[EVERYTHING] + All shares /data/samba "@Domain Admins" No -[CDROM] + CD-ROM on MASSIVE /mnt Yes -[print$] + Printer Drivers Share /data/samba/drivers root No -[printers] + All Printers /data/samba/spool 0644 Yes No -[acct_hp8500] + "Accounting Color Laser Printer" /data/samba/spool/private @acct, @acct_admin, @hr, "@Domain Admins",\ @@ -650,7 +650,7 @@ shadow: files ldap Yes printers -[plotter] + Engineering Plotter /data/samba/spool 0644 @@ -661,12 +661,12 @@ shadow: files ldap Samba Configuration File &smbmdash; smb.conf Part D -[APPS] + /data/samba/shares/Apps "Domain Users" No -[ACCT] + /data/samba/shares/Accounting @acct, "@Domain Admins" acct @@ -674,24 +674,24 @@ shadow: files ldap 0660 0770 -[ACCT_ADMIN] + /data/samba/shares/Acct_Admin @”acct_admin” acct_admin -[HR_PR] + /data/samba/shares/HR_PR @hr, @acct_admin hr -[ENGR] + /data/samba/shares/Engr @engr, @receptionist, @truss, "@Domain Admins", cheri engr No 0770 -[DATA] + /data/samba/shares/DATA @engr, @receptionist, @truss, "@Domain Admins", cheri engr @@ -702,7 +702,7 @@ shadow: files ldap Samba Configuration File &smbmdash; smb.conf Part E -[X] + /data/samba/shares/X @engr, @acct engr @@ -710,18 +710,18 @@ shadow: files ldap 0770 engr -[NETWORK] + /data/samba/shares/network "@Domain Users" No 0770 Yes -[UTILS] + /data/samba/shares/Utils "@Domain Admins" -[SYS] + /data/samba/shares/SYS chad No diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml index c09849f9d7..a4827426fc 100644 --- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml +++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml @@ -1,5 +1,5 @@ - + Adding UNIX/LINUX Servers and Clients @@ -671,7 +671,7 @@ Joined domain MEGANET2. Samba Domain Member in Samba Domain Control Context &smbmdash; &smb.conf; File Global parameters -[global] + LOCALE MEGANET2 DOMAIN @@ -697,20 +697,20 @@ Joined domain MEGANET2. root cups -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes Yes No -[print$] + Printer Drivers /var/lib/samba/drivers root, Administrator @@ -969,7 +969,7 @@ MEGANET2+PIOps:x:10005: Samba Domain Member Server &smb.conf; File for NT4 Domain Global parameters -[global] + LOCALE MEGANET2 DOMAIN @@ -991,20 +991,20 @@ MEGANET2+PIOps:x:10005: 192.168.2., 192.168.3., 127. cups -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes Yes No -[print$] + Printer Drivers /var/lib/samba/drivers root, Administrator @@ -1641,7 +1641,7 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- Samba Domain Member &smb.conf; File for Active Directory Membership Global parameters -[global] + LOCALE LONDON LONDON.ABMAS.BIZ @@ -1661,20 +1661,20 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- + cups -[homes] + Home Directories %S No No -[printers] + SMB Print Spool /var/spool/samba Yes Yes No -[print$] + Printer Drivers /var/lib/samba/drivers root, Administrator diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml index 50be790e20..bcd00dbd86 100644 --- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml +++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml @@ -1,5 +1,5 @@ - + Active Directory, Kerberos, and Security @@ -1941,7 +1941,7 @@ other::r-x valid users - The valid users did not work on the [homes]. + The valid users did not work on the . Has this functionality been restored yet? @@ -1952,7 +1952,7 @@ other::r-x meta-service Yes. This was fixed in Samba-3.0.2. The use of this parameter is strongly recommended as a safeguard - on the [homes] meta-service. The correct way to specify this is: + on the meta-service. The correct way to specify this is: %S. diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml index 76dec83d14..7079cc718b 100644 --- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml +++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml @@ -1,5 +1,5 @@ - + Integrating Additional Services @@ -697,7 +697,7 @@ password: XXXXXXXX Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename> -[global] + LONDON W2K3S LONDON.ABMAS.BIZ diff --git a/docs/Samba-Guide/index.xml b/docs/Samba-Guide/index.xml index bb72a62cea..9b578b68f0 100644 --- a/docs/Samba-Guide/index.xml +++ b/docs/Samba-Guide/index.xml @@ -10,7 +10,6 @@ &person.jht; March 4, 2005 - 20050304