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/Makefile | 4 +- 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 - docs/Samba-HOWTO-Collection/BDC.xml | 8 +- docs/Samba-HOWTO-Collection/CUPS-printing.xml | 64 +++++----- docs/Samba-HOWTO-Collection/Diagnosis.xml | 14 +-- docs/Samba-HOWTO-Collection/DomainMember.xml | 7 +- docs/Samba-HOWTO-Collection/FastStart.xml | 63 +++++----- docs/Samba-HOWTO-Collection/Group-Mapping.xml | 6 +- docs/Samba-HOWTO-Collection/Install.xml | 16 +-- docs/Samba-HOWTO-Collection/IntroSMB.xml | 4 +- docs/Samba-HOWTO-Collection/NT4Migration.xml | 2 +- docs/Samba-HOWTO-Collection/NetworkBrowsing.xml | 28 ++--- docs/Samba-HOWTO-Collection/Other-Clients.xml | 6 +- docs/Samba-HOWTO-Collection/PDC.xml | 10 +- docs/Samba-HOWTO-Collection/Passdb.xml | 13 +-- docs/Samba-HOWTO-Collection/PolicyMgmt.xml | 2 +- docs/Samba-HOWTO-Collection/Printing.xml | 129 ++++++++++----------- docs/Samba-HOWTO-Collection/Problems.xml | 2 +- docs/Samba-HOWTO-Collection/ProfileMgmt.xml | 15 ++- .../Samba-HOWTO-Collection/RightsAndPriviliges.xml | 2 +- docs/Samba-HOWTO-Collection/Securing.xml | 12 +- docs/Samba-HOWTO-Collection/StandAloneServer.xml | 8 +- docs/Samba-HOWTO-Collection/Unicode.xml | 6 +- docs/Samba-HOWTO-Collection/VFS.xml | 6 +- docs/Samba-HOWTO-Collection/Winbind.xml | 5 +- docs/Samba-HOWTO-Collection/glossary.xml | 6 +- docs/Samba-HOWTO-Collection/locking.xml | 10 +- docs/Samba-HOWTO-Collection/msdfs.xml | 4 +- docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml | 2 +- docs/configure.in | 2 +- docs/manpages/smb.conf.5.xml | 8 +- docs/xslt/upgrade.pl | 1 + 42 files changed, 350 insertions(+), 362 deletions(-) (limited to 'docs') diff --git a/docs/Makefile b/docs/Makefile index 8be60d90e5..9f672d93a6 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -172,7 +172,7 @@ $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml # PDF thru Fo $(FOPDFDIR)/%.pdf: $(FODIR)/%.fo mkdir -p $(@D) - $(FOP) -q -d $< -pdf $@ + JAVA_OPTS=-Xmx250m $(FOP) -q -d $< -pdf $@ $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml mkdir -p $@/images @@ -226,7 +226,7 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml # Validation verification %-validate: %/index.xml - -$(XMLLINT) --xinclude --noent --postvalid --noout $< + -cd $( - + 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 RequestRoot /var/spool/cups/ in -cupsd.conf and -/var/spool/samba in the [printers] +cupsd.conf and +/var/spool/samba in the section of &smb.conf;. Otherwise cupsd will sanitize permissions to its spool directory with each restart and printing will not work reliably. diff --git a/docs/Samba-HOWTO-Collection/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml index ffc79c7dcc..9cf797a702 100644 --- a/docs/Samba-HOWTO-Collection/Diagnosis.xml +++ b/docs/Samba-HOWTO-Collection/Diagnosis.xml @@ -50,14 +50,14 @@ The procedure is similar for other types of clients. It is also assumed you know the name of an available share in your -&smb.conf;. I will assume this share is called tmp. -You can add a tmp share like this by adding the +&smb.conf;. I will assume this share is called . +You can add a share like this by adding the lines shown in the next example. smb.conf with [tmp] share -[tmp] + temporary files /tmp yes @@ -242,7 +242,7 @@ the &smb.conf; file entries as shown in the next example< Configuration for only allowing connections from a certain subnet -[globals] + ... ALL xxx.xxx.xxx.xxx/yy @@ -261,7 +261,7 @@ To solve this problem, change these lines as shown in the Configuration for allowing connections from a certain subnet and localhost -[globals] + ... ALL xxx.xxx.xxx.xxx/yy 127. @@ -383,7 +383,7 @@ It is possible to specify the password along with the username as follows: Once you enter the password, you should get the smb> prompt. If you do not, then look at the error message. If it says invalid network -name, then the service tmp is not correctly setup in your &smb.conf;. +name, then the service is not correctly setup in your &smb.conf;. @@ -503,7 +503,7 @@ and other config lines in &smb.conf; are correct. It's also possible that the server can't work out what user name to connect you as. To see if this is the problem, add the line username to the -[tmp] section of + section of &smb.conf; where username is the username corresponding to the password you typed. If you find this fixes things, you may need the username mapping option. diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml index 0a28ac882d..0c7689c32f 100644 --- a/docs/Samba-HOWTO-Collection/DomainMember.xml +++ b/docs/Samba-HOWTO-Collection/DomainMember.xml @@ -368,10 +368,9 @@ Here is an example for a Red Hat Linux system. -[global] + <...remainder of parameters...> -/usr/sbin/useradd -d /var/lib/nobody -g 100 \ - -s /bin/false -M %u +/usr/sbin/useradd -d /var/lib/nobody -g 100 -s /bin/false -M %u @@ -522,7 +521,7 @@ of your &smb.conf; to read: -Next change the line in the [global] +Next change the line in the section to read: diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml index 8b8aba656b..2dc995bb5a 100644 --- a/docs/Samba-HOWTO-Collection/FastStart.xml +++ b/docs/Samba-HOWTO-Collection/FastStart.xml @@ -123,12 +123,12 @@ of the packages that are provided by the operating system vendor, or through oth Anonymous Read-Only Server Configuration Global parameters - [global] + MIDEARTH HOBBIT share - [data] + Data /export Yes @@ -259,12 +259,12 @@ Added user jackb. Modified Anonymous Read-Write smb.conf Global parameters -[global] + MIDEARTH HOBBIT SHARE -[data] + Data /export jackb @@ -312,7 +312,7 @@ Added user jackb. Anonymous Print Server smb.conf Global parameters -[global] + MIDEARTH LUTHIEN share @@ -321,7 +321,7 @@ Added user jackb. No cups -[printers] + All Printers /var/spool/samba Yes @@ -432,7 +432,7 @@ Added user jackb. Secure Office Server smb.conf Global parameters -[global] + MIDEARTH OLORIN cups @@ -440,13 +440,13 @@ Added user jackb. No cups -[homes] + Home Directories %S No No -[public] + Data /export maryo @@ -454,7 +454,7 @@ Added user jackb. Yes No -[printers] + All Printers /var/spool/samba root, maryo @@ -644,7 +644,7 @@ smb: \> q Member server smb.conf (globals) Global parameters -[global] + MIDEARTH VALINOR DOMAIN @@ -661,25 +661,25 @@ smb: \> q Member server smb.conf (shares and services) -[homes] + Home Directories %S No No -[spytfull] + Accounting Application Only /export/spytfull @Accounts maryo Yes -[public] + Data /export/public No -[printers] + All Printers /var/spool/samba root, maryo @@ -872,7 +872,7 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false pdbedit Engineering Office smb.conf (globals) -[global] + MIDEARTH FRODO tdbsam @@ -882,8 +882,7 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false /usr/sbin/groupadd %g /usr/sbin/groupdel %g /usr/sbin/usermod -G %g %u -/usr/sbin/useradd -s /bin/false \ - -d /var/lib/nobody %u +/usr/sbin/useradd -s /bin/false -d /var/lib/nobody %u Note: The following specifies the default logon script. Per user logon scripts can be specified in the user account using pdbedit scripts\logon.bat @@ -902,14 +901,14 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false Engineering Office smb.conf (shares and services) -[homes] + Home Directories %S No No Printing auto-share (makes printers available thru CUPS) -[printers] + All Printers /var/spool/samba root, maryo @@ -918,14 +917,14 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false Yes No -[print$] + Printer Drivers Share /var/lib/samba/drivers maryo, root maryo, root Needed to support domain logons -[netlogon] + Network Logon Service /var/lib/samba/netlogon root, maryo @@ -934,14 +933,13 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false For profiles to work, create a user directory under the path shown. i.e., mkdir -p /var/lib/samba/profiles/maryo -[Profiles] + Roaming Profile Share /var/lib/samba/profiles No Yes Other resource (share/printer) definitions would follow below. -... @@ -991,7 +989,7 @@ net groupmap add ntgroup="QA Team" unixgroup=qateam type=d Create the scripts directory for use in the - [NETLOGON] share: + share: &rootprompt;mkdir -p /var/lib/samba/netlogon/scripts @@ -1144,7 +1142,7 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb LDAP backend smb.conf for PDC Global parameters -[global] + MIDEARTH FRODO ldapsam:ldap://localhost @@ -1154,12 +1152,9 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb /usr/local/sbin/smbldap-userdel.pl %u /usr/local/sbin/smbldap-groupadd.pl -p '%g' /usr/local/sbin/smbldap-groupdel.pl '%g' -/usr/local/sbin/ \ -smbldap-groupmod.pl -m '%g' '%u' -/usr/local/sbin/ \ -smbldap-groupmod.pl -x '%g' '%u' -/usr/local/sbin/ \ -smbldap-usermod.pl -g '%g' '%u' +/usr/local/sbin/smbldap-groupmod.pl -m '%g' '%u' +/usr/local/sbin/smbldap-groupmod.pl -x '%g' '%u' +/usr/local/sbin/smbldap-usermod.pl -g '%g' '%u' /usr/local/sbin/smbldap-useradd.pl -w '%u' scripts\logon.bat \\%L\Profiles\%U @@ -1180,7 +1175,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb 15000-20000 15000-20000 cups -... @@ -1217,7 +1211,7 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb Remote LDAP BDC smb.conf Global parameters -[global] + MIDEARTH GANDALF ldapsam:ldap://frodo.quenya.org @@ -1242,7 +1236,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb 15000-20000 15000-20000 cups -... diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index 40d00aba05..68459cf2f0 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -525,12 +525,10 @@ 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. -[global] -... + /path_to_tool/smbgrpadd.sh "%g" -... diff --git a/docs/Samba-HOWTO-Collection/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml index 04630a111a..60266274af 100644 --- a/docs/Samba-HOWTO-Collection/Install.xml +++ b/docs/Samba-HOWTO-Collection/Install.xml @@ -63,13 +63,13 @@ A minimal smb.conf - [global] + WKG MYNAME - [share1] + /tmp - [share2] + /my_shared_folder Some random files @@ -150,10 +150,10 @@ simple configuration Another simple smb.conf File -[global] + &example.workgroup; -[homes] + no no @@ -161,7 +161,7 @@ This will allow connections by anyone with an account on the server, using either - their login name or homes as the service name. + their login name or as the service name. (Note: The workgroup that Samba should appear in must also be set. The default workgroup name is WORKGROUP.) @@ -172,7 +172,7 @@ For more information about security settings for the - [homes] share please refer to + share please refer to Securing Samba chapter. @@ -263,7 +263,7 @@ Typically yourhostname is the name of the host on which &smbd; has been installed. The aservice is any service that has been defined in the &smb.conf; - file. Try your user name if you just have a [homes] section in the &smb.conf; file. + file. Try your user name if you just have a section in the &smb.conf; file. Example: If the UNIX host is called bambi and a valid login name is fred, you would type: diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml index 977ef2131e..547a55f43a 100644 --- a/docs/Samba-HOWTO-Collection/IntroSMB.xml +++ b/docs/Samba-HOWTO-Collection/IntroSMB.xml @@ -1,10 +1,10 @@ - + &author.jht; June 29, 2003 - + Preface and Introduction diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml index 8224a73c53..4f65b8c0a7 100644 --- a/docs/Samba-HOWTO-Collection/NT4Migration.xml +++ b/docs/Samba-HOWTO-Collection/NT4Migration.xml @@ -178,7 +178,7 @@ Logon scripts can help to ensure that all users gain the share and printer conne Logon scripts can be created on-the-fly so all commands executed are specific to the rights and privileges granted to the user. The preferred controls should be affected through group membership so group information can be used to create a custom logon script using -the parameters to the NETLOGON share. +the parameters to the share. diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml index 654d246300..6470295d66 100644 --- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml +++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml @@ -607,7 +607,7 @@ cross-subnet browsing possible for a workgroup. In a WORKGROUP environment the Domain Master Browser must be a Samba server, and there must only be one Domain Master Browser per workgroup name. To set up a Samba server as a Domain Master Browser, -set the following option in the [global] section +set the following option in the section of the &smb.conf; file: @@ -620,14 +620,14 @@ of the &smb.conf; file: The Domain Master Browser should preferably be the local master browser for its own subnet. In order to achieve this, set the following -options in the [global] section of the &smb.conf; +options in the section of the &smb.conf; file as shown in the following example: Domain Master Browser smb.conf -[global] + yes yes yes @@ -645,14 +645,14 @@ a Local Master Browser for the workgroup. Any MS Windows NT/200x/XP machine shou be able to do this, as will Windows 9x/Me machines (although these tend to get rebooted more often, so it is not such a good idea to use these). To make a Samba server a Local Master Browser set the following options in the -[global] section of the &smb.conf; file as + section of the &smb.conf; file as shown in following example: Local master browser smb.conf -[global] + no yes yes @@ -674,14 +674,14 @@ parameter sets Samba high enough so it should win any browser elections. If you have an NT machine on the subnet that you wish to be the Local Master Browser, you can disable Samba from -becoming a Local Master Browser by setting the following options in the [global] section of the +becoming a Local Master Browser by setting the following options in the section of the &smb.conf; file as shown in following example: smb.conf for not being a Master Browser -[global] + no no no @@ -703,14 +703,14 @@ with WINS instead of the PDC. For subnets other than the one containing the Windows NT PDC, you may set up Samba servers as Local Master Browsers as -described. To make a Samba server a Local Master Browser, set the following options in the [global] section +described. To make a Samba server a Local Master Browser, set the following options in the section of the &smb.conf; file as shown in following example: Local Master Browser smb.conf -[global] + no yes yes @@ -729,13 +729,13 @@ they are running. For more details on this refer to next example: + section of the &smb.conf; file as shown in next example: &smb.conf; for not being a master browser -[global] + no no no @@ -1007,7 +1007,7 @@ file [global] section. To configure Samba to register with a WINS server just add a.b.c.d -to your &smb.conf; file [global] section. +to your &smb.conf; file section. @@ -1023,7 +1023,7 @@ particularly not using its own IP address. Specifying both will cause &nmbd; to Either a Samba Server or a Windows NT Server machine may be set up as a WINS server. To configure a Samba Server to be a WINS server you must add to the &smb.conf; file on the selected Server the following line to -the [global] section: +the section: @@ -1071,7 +1071,7 @@ of this WINS server. If your WINS server is a Samba machine, fill in the Samba machine IP address in the Primary WINS Server field of the Control Panel->Network->Protocols->TCP->WINS Server dialogs in Windows 9x/Me or Windows NT/200x. To tell a Samba server the IP address -of the WINS server, add the following line to the [global] section of +of the WINS server, add the following line to the section of all &smb.conf; files: diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml index 663dcc6fd0..0a0d78fd91 100644 --- a/docs/Samba-HOWTO-Collection/Other-Clients.xml +++ b/docs/Samba-HOWTO-Collection/Other-Clients.xml @@ -103,7 +103,7 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) Printer Driver Download for OS/2 Clients - Create a share called [PRINTDRV] that is + Create a share called that is world-readable. Copy your OS/2 driver files there. The .EA_ files must still be separate, so you will need to use the original install files and not copy an installed driver from an OS/2 system. @@ -220,7 +220,7 @@ It is presumably a Windows for Workgroups bug. Note that some people have found that setting DefaultRcvWindow in -the [MSTCP] section of the +the section of the SYSTEM.INI file under Windows for Workgroups to 3072 gives a big improvement. @@ -310,7 +310,7 @@ releases prior to Samba 2.2.2. Minimal profile share -[profile] + /export/profile 0600 0700 diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml index 1a225c8cd7..809d353833 100644 --- a/docs/Samba-HOWTO-Collection/PDC.xml +++ b/docs/Samba-HOWTO-Collection/PDC.xml @@ -429,7 +429,7 @@ in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in smb.conf for being a PDC -[global] + BELERIAND &example.workgroup; tdbsam @@ -444,12 +444,12 @@ in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in \\homeserver\%U\winprofile logon.cmd -[netlogon] + /var/lib/samba/netlogon yes ntadmin -[profiles] + /var/lib/samba/profiles no 0600 @@ -584,11 +584,11 @@ must be set. smb.conf for being a PDC -[global] + Yes (Yes on PDC, No on BDCs) -[netlogon] + Network Logon Service /var/lib/samba/netlogon Yes diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml index 29bd6d296e..2db2764f42 100644 --- a/docs/Samba-HOWTO-Collection/Passdb.xml +++ b/docs/Samba-HOWTO-Collection/Passdb.xml @@ -422,7 +422,7 @@ Samba-3 introduces a number of new password backend capabilities. SAM backendldapsam Example configuration with the LDAP idmap backend -[global] + ldap:ldap://ldap-server.quenya.org:636 Alternately, this could be specified as: ldap:ldaps://ldap-server.quenya.org @@ -660,8 +660,7 @@ backends of the same type. For example, to use two different tdbsam databases: - tdbsam:/etc/samba/passdb.tdb \ - tdbsam:/etc/samba/old-passdb.tdb + tdbsam:/etc/samba/passdb.tdb tdbsam:/etc/samba/old-passdb.tdb @@ -1102,7 +1101,7 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz Configuration with LDAP -[global] + user yes MORIA @@ -1502,7 +1501,7 @@ access to attrs=SambaLMPassword,SambaNTPassword - Additional options can be given through the &smb.conf; file in the [global] section. + Additional options can be given through the &smb.conf; file in the section. Refer to the following table. @@ -1591,7 +1590,7 @@ access to attrs=SambaLMPassword,SambaNTPassword Example configuration for the MySQL passdb backend - [global] + mysql:foo samba abmas @@ -1701,7 +1700,7 @@ access to attrs=SambaLMPassword,SambaNTPassword - [global] + ... smbpasswd, tdbsam ... diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml index 8c12c92ede..c4fb0aeaaa 100644 --- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml +++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml @@ -122,7 +122,7 @@ here is incomplete &smbmdash; you are warned. Use the Group Policy Editor to create a policy file that specifies the location of user profiles and/or My Documents, and so on. Then save these settings in a file called Config.POL that needs to be placed in the - root of the [NETLOGON] share. If Windows 98 is configured to log onto + root of the share. If Windows 98 is configured to log onto the Samba Domain, it will automatically read this file and update the Windows 9x/Me registry of the machine as it logs on. diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml index aa89b1e0ef..1d2fc8eeb6 100644 --- a/docs/Samba-HOWTO-Collection/Printing.xml +++ b/docs/Samba-HOWTO-Collection/Printing.xml @@ -161,7 +161,7 @@ overview of these. As with other parameters, there are Global Level Service Level Parameters These may be specified in the - [global] section of &smb.conf;. + section of &smb.conf;. In this case they define the default behavior of all individual or service level shares (provided they do not have a different setting defined for the same parameter, thus overriding the @@ -189,11 +189,11 @@ However, in many environments these are enough to provide a valid Simple configuration with BSD printing -[global] + bsd yes -[printers] + /var/spool/samba yes yes @@ -397,7 +397,7 @@ testparm issued two warnings: - We did not specify the [printers] section as printable. + We did not specify the section as printable. We did not tell Samba which spool directory to use. @@ -448,7 +448,7 @@ file to remove all parameters that are set at default. Extended BSD Printing Configuration -[global] + bsd yes yes @@ -458,7 +458,7 @@ file to remove all parameters that are set at default. 20 no -[printers] + All Printers yes /var/spool/samba @@ -468,7 +468,7 @@ file to remove all parameters that are set at default. yes no -[my_printer_name] + Printer with Restricted Access /var/spool/samba_my_printer kurt @@ -499,11 +499,11 @@ The following is a discussion of the settings from above shown example. The [global] Section -The [global] section is one of four special -sections (along with [[homes], -[printers] -and [print$]...). The -[global] contains all parameters which apply +The section is one of four special +sections (along with [, + +and ...). The + contains all parameters which apply to the server as a whole. It is the place for parameters that have only a global meaning. It may also contain service level parameters that then define default settings for all other sections and shares. This way you can simplify @@ -524,7 +524,7 @@ share settings and specify other values). The parameter is normally a service level parameter. Since it is included here in the - [global] section, it will take effect for all + section, it will take effect for all printer shares that are not defined differently. Samba-3 no longer supports the SOFTQ printing system. @@ -536,7 +536,7 @@ share settings and specify other values). for browsing. If you use this parameter, you do not need to specify separate shares for each printer. Each automatically created printer share will clone the configuration options found in the - [printers] section. (The load printers + section. (The load printers = no setting will allow you to specify each UNIX printer you want to share separately, leaving out some you do not want to be publicly visible and available). @@ -550,7 +550,7 @@ share settings and specify other values). by the net view command). To disable it, you need to explicitly set it to no (commenting it out will not suffice). The Add Printer Wizard lets you upload printer - drivers to the [print$] share and associate it + drivers to the share and associate it with a printer (if the respective queue exists before the action), or exchange a printer's driver against any other previously uploaded driver. @@ -627,7 +627,7 @@ man page.) Settings inside this container must be Share Level parameters. yes - The [printers] service must + The service must be declared as printable. If you specify otherwise, smbd will refuse to load at startup. This parameter allows connected clients to open, write to and submit spool files into the directory specified with the @@ -649,7 +649,7 @@ man page.) Settings inside this container must be Share Level parameters. Is always set to no if yes. It makes - the [printer] share itself invisible in the list of + the share itself invisible in the list of available shares in a net view command or in the Explorer browse list. (You will of course see the individual printers). @@ -732,7 +732,7 @@ to a printer with the same name! kurt The printer admin definition is different for this explicitly defined printer share from the general - [printers] share. It is not a requirement; we + share. It is not a requirement; we did it to show that it is possible. @@ -784,7 +784,7 @@ to a printer with the same name! Print Commands -In each section defining a printer (or in the [printers] section), +In each section defining a printer (or in the section), a print command parameter may be defined. It sets a command to process the files that have been placed into the Samba print spool directory for that printer. (That spool directory was, if you remember, set up with the parameter). Typically, @@ -940,7 +940,7 @@ sent to the default printer. -If specified in the [global] section, the print command given will be +If specified in the section, the print command given will be used for any printable service that does not have its own print command specified. If there is neither a specified print command for a printable service nor a global print command, spool files will be created but not processed! Most importantly, print files will not be removed, so they will consume disk space. @@ -949,7 +949,7 @@ but not processed! Most importantly, print files will not be removed, so they wi Printing may fail on some UNIX systems when using the nobody account. If this happens, create an alternative guest account and give it the privilege to print. Set up this guest account in the -[global] section with the guest account parameter. + section with the guest account parameter. @@ -963,8 +963,7 @@ is the usual separator for commands in shell scripts: -echo Printing %s >> \ -/tmp/print.log; lpr -P %p %s; rm %s + echo Printing %s >> /tmp/print.log; lpr -P %p %s; rm %s @@ -1061,11 +1060,11 @@ require that the Samba server possess a valid driver for the printer. This was f -But it is a new capability to install the printer drivers into the [print$] +But it is a new capability to install the printer drivers into the share of the Samba server, and a big convenience, too. Then all clients (including 95/98/ME) get the driver installed when they first connect to this printer share. The uploading or depositing of the driver into this -[print$] share and the following binding of this driver to an existing + share and the following binding of this driver to an existing Samba printer share can be achieved by different means: @@ -1104,7 +1103,7 @@ system, which is responsible for all further processing, as needed. Versions of Samba prior to 2.2 made it possible to use a share named [printer$]. This name was taken from the same named service created by Windows 9x/Me clients when a printer was shared by them. Windows 9x/Me printer servers always - have a [printer$] service that provides read-only access (with + have a service that provides read-only access (with no password required) to support printer driver downloads. However, Samba's initial implementation allowed for a parameter named printer driver location to be used on a per share basis. This specified the location of the driver files associated with @@ -1115,12 +1114,12 @@ system, which is responsible for all further processing, as needed. These parameters, including the printer driver file parameter, are now removed and cannot be used in installations of Samba-3. The share name - [print$] is now used for the location of download-able printer - drivers. It is taken from the [print$] service created + is now used for the location of download-able printer + drivers. It is taken from the service created by Windows NT PCs when a printer is shared by them. Windows NT print servers always have a - [print$] service that provides read-write access (in the context + service that provides read-write access (in the context of its ACLs) to support printer driver downloads and uploads. This does not mean Windows - 9x/Me clients are now thrown aside. They can use Samba's [print$] + 9x/Me clients are now thrown aside. They can use Samba's share support just fine. @@ -1130,14 +1129,14 @@ system, which is responsible for all further processing, as needed. In order to support the uploading and downloading of printer driver files, you must first configure a -file share named [print$]. The public name of this share is hard coded +file share named . The public name of this share is hard coded in the MS Windows clients. It cannot be renamed since Windows clients are programmed to search for a service of exactly this name if they want to retrieve printer driver files. You should modify the server's file to add the global parameters and create the -[print$] file share (of course, some of the parameter values, such + file share (of course, some of the parameter values, such as are arbitrary and should be replaced with appropriate values for your site). See next example. @@ -1145,14 +1144,14 @@ site). See next example. [print\$] example -[global] + members of the ntadmin group should be able to add drivers and set printer properties. root is implicitly always a 'printer admin'. @ntadmin ... -[printers] + ... -[print$] + Printer Driver Download Area /etc/samba/drivers yes @@ -1173,7 +1172,7 @@ Of course, you also need to ensure that the directory named by the [print$] Section Parameters -The [print$] is a special section in &smb.conf;. It contains settings relevant to +The is a special section in &smb.conf;. It contains settings relevant to potential printer driver download and is used by windows clients for local print driver installation. The following parameters are frequently needed in this share section: @@ -1195,7 +1194,7 @@ The following parameters are frequently needed in this share section: no - Makes the [print$] share invisible to clients from the + Makes the share invisible to clients from the Network Neighborhood. However, you can still mount it from any client using the net use g:\\sambaserver\print$ command in a DOS-box or the Connect network drive menu> from Windows Explorer. @@ -1216,7 +1215,7 @@ The following parameters are frequently needed in this share section: validated by the Domain Controller in order to logon to the Windows NT session), then guest access is not necessary. Of course, in a workgroup environment where you just want to print without worrying about silly accounts and security, then configure the share for - guest access. You should consider adding Bad User in the [global] section + guest access. You should consider adding Bad User in the section as well. Make sure you understand what this parameter does before using it. @@ -1231,7 +1230,7 @@ The following parameters are frequently needed in this share section: @ntadmin, root - The [print$] was made read-only by the previous + The was made read-only by the previous setting so we should create a write list entry also. UNIX groups (denoted with a leading @ character). Users listed here are allowed write-access (as an exception to the general public's read-only access), which they need to @@ -1251,17 +1250,17 @@ The following parameters are frequently needed in this share section: In order for a Windows NT print server to support the downloading of driver files by multiple client -architectures, you must create several subdirectories within the [print$] +architectures, you must create several subdirectories within the service (i.e., the UNIX directory named by the parameter). These correspond to each of the supported client architectures. Samba follows this model as -well. Just like the name of the [print$] share itself, the subdirectories +well. Just like the name of the share itself, the subdirectories must be exactly the names listed below (you may leave out the subdirectories of architectures you do not need to support). Therefore, create a directory tree below the -[print$] share for each architecture you wish + share for each architecture you wish to support like this: @@ -1292,12 +1291,12 @@ to support like this: Of course, the connected account must still have write access to add files to the subdirectories beneath - [print$]. Remember that all file shares are set to read-only by default. + . Remember that all file shares are set to read-only by default. -Once you have created the required [print$] service and +Once you have created the required service and associated subdirectories, go to a Windows NT 4.0/200x/XP client workstation. Open Network Neighborhood or My Network Places and browse for the Samba host. Once you have located the server, navigate to its Printers and Faxes folder. You should see @@ -1310,14 +1309,14 @@ an initial listing of printers that matches the printer shares defined on your S Installing Drivers into [print$] -Have you successfully created the [print$] share in &smb.conf;, and have your forced Samba +Have you successfully created the share in &smb.conf;, and have your forced Samba to re-read its &smb.conf; file? Good. But you are not yet ready to use the new facility. The client driver files need to be installed into this share. So far it is still an empty share. Unfortunately, it is not enough to just copy the driver files over. They need to be correctly installed so that appropriate records for each driver will exist in the Samba internal databases so it can provide the correct drivers as they are requested from MS Windows clients. And that is a bit tricky, to say the least. We -now discuss two alternative ways to install the drivers into [print$]: +now discuss two alternative ways to install the drivers into : @@ -1398,7 +1397,7 @@ device settings, please consider the advice given further in and set them up in a valid way is to do it from the UNIX command line. This involves four distinct steps: @@ -1408,7 +1407,7 @@ up in a valid way is to do it from the UNIX command line. This involves four dis - Deposit the driver files into the [print$] share's correct subdirectories + Deposit the driver files into the share's correct subdirectories (possibly by using smbclient). @@ -1511,7 +1510,7 @@ Windows PC. This PC can also host the Windows 9x/Me drivers, even if it runs on -Since the [print$] share is usually accessible through the Network +Since the share is usually accessible through the Network Neighborhood, you can also use the UNC notation from Windows Explorer to poke at it. The Windows 9x/Me driver files will end up in subdirectory 0 of the WIN40 directory. The full path to access them will be \\WINDOWSHOST\print$\WIN40\0\. @@ -1531,7 +1530,7 @@ for this. These types of drivers install into the 3 subdirectory. Now we need to collect all the driver files we identified in our previous step. Where do we get them -from? Well, why not retrieve them from the very PC and the same [print$] +from? Well, why not retrieve them from the very PC and the same share that we investigated in our last step to identify the files? We can use smbclient to do this. We will use the paths and names that were leaked to us by getdriver. The listing is edited to include line breaks for readability: @@ -1563,7 +1562,7 @@ exits again. Remember to repeat the procedure for the WIN40 architecture should you need to support Windows 9x/Me/XP clients. Remember too, the files for these architectures are in the WIN40/0/ subdirectory. Once this is complete, we can run smbclient ... -put to store the collected files on the Samba server's [print$] +put to store the collected files on the Samba server's share. @@ -1572,11 +1571,11 @@ share. Installing Driver Files into [print$] -We are now going to locate the driver files into the [print$] +We are now going to locate the driver files into the share. Remember, the UNIX path to this share has been defined previously in your words missing here. You also have created subdirectories for the different Windows client types you want to -support. Supposing your [print$] share maps to the UNIX path +support. Supposing your share maps to the UNIX path /etc/samba/drivers/, your driver files should now go here: @@ -1596,7 +1595,7 @@ support. Supposing your [print$] share maps to We again use smbclient to transfer the driver files across the network. We specify the same files and paths as were leaked to us by running getdriver against the original Windows install. However, now we are going to store the files into a -Samba/UNIX print server's [print$] share. +Samba/UNIX print server's share. @@ -1705,7 +1704,7 @@ to which print queue(s) these driver files belong. Next, you must tell Samba about the special category of the files you just uploaded into the -[print$] share. This is done by the adddriver + share. This is done by the adddriver command. It will prompt Samba to register the driver files into its internal TDB database files. The following command and its output has been edited, again, for readability: @@ -1843,7 +1842,7 @@ status of the files by at least three methods: You will see a listing of all drivers Samba knows about. Your new one should be among them. But it is only listed under the [Windows NT x86] heading, not under - [Windows 4.0], since you didn't install that part. Or did you? + , since you didn't install that part. Or did you? You will see a listing of all drivers Samba knows about. Your new one should be among them. In our example it is named dm9110. Note that the third column shows the other installed drivers twice, one time for each supported architecture. Our new driver only shows up @@ -1887,7 +1886,7 @@ Printer Driver mydrivername successfully installed. You will be able to bind that driver to any print queue (however, you are responsible that you associate drivers to queues that make sense with respect to target printers). You cannot run the rpcclient adddriver command repeatedly. Each run consumes the -files you had put into the [print$] share by moving them into the +files you had put into the share by moving them into the respective subdirectories. So you must execute an smbclient ... put command before each rpcclient ... adddriver command. @@ -2060,7 +2059,7 @@ Be aware that a valid Device Mode can only be initiated by a set by executing the printer driver program itself. Since Samba cannot execute this Win32 platform driver code, it sets this field initially to NULL (which is not a valid setting for clients to use). Fortunately, most drivers automatically generate the Printer Driver Data that is needed when they are uploaded to the -[print$] share with the help of the APW or rpcclient. + share with the help of the APW or rpcclient. @@ -2169,7 +2168,7 @@ command... field from the Start menu. Always Make First Client Connection as root or <quote>printer admin</quote> -After you installed the driver on the Samba server (in its [print$] +After you installed the driver on the Samba server (in its share, you should always make sure that your first client installation completes correctly. Make it a habit for yourself to build the very first connection from a client as . This is to make sure that: @@ -2363,7 +2362,7 @@ to think about a non-interactive script. If more than one printer is using the same driver, the rpcclient setdriver command can be used to set the driver associated with an installed queue. If the driver is uploaded to -[print$] once and registered with the printing TDBs, it can be used by + once and registered with the printing TDBs, it can be used by multiple print queues. In this case, you just need to repeat the setprinter subcommand of rpcclient for every queue (without the need to conduct the adddriver repeatedly). The following is an example of how this could be accomplished: @@ -2481,7 +2480,7 @@ The APW can do various things: - Upload a new driver to the Samba [print$] share. + Upload a new driver to the Samba share. @@ -2967,7 +2966,7 @@ The second line only works if the printer infotec2105-PS ha print queue on the cupsserver, and if the printer drivers have been successfully uploaded (via the APW, smbclient/rpcclient, or cupsaddsmb) -into the [print$] driver repository of Samba. Some Samba versions +into the driver repository of Samba. Some Samba versions prior to version 3.0 required a re-start of smbd after the printer install and the driver upload, otherwise the script (or any other client driver download) would fail. @@ -3041,16 +3040,16 @@ follow several paths. Here are possible scenarios for migration: An existing printers.def file (the one specified in the now removed parameter printer driver file) will no longer work with Samba-3. In 3.0, smbd attempts - to locate a Windows 9x/Me driver files for the printer in [print$] + to locate a Windows 9x/Me driver files for the printer in and additional settings in the TDB and only there; if it fails, it will not (as 2.2.x used to do) drop down to using a printers.def (and all associated parameters). The make_printerdef tool is removed and there is no backward compatibility for this. You need to install a Windows 9x/Me driver into the - [print$] share for a printer on your Samba + share for a printer on your Samba host. The driver files will be stored in the WIN40/0 subdirectory of - [print$], and some other settings and information go + , and some other settings and information go into the printing-related TDBs. If you want to migrate an existing diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml index edd977b260..1aa065d1c8 100644 --- a/docs/Samba-HOWTO-Collection/Problems.xml +++ b/docs/Samba-HOWTO-Collection/Problems.xml @@ -232,7 +232,7 @@ If you do post a message to one of the lists, please observe the following guide Always mention what version of Samba you are using and what operating system it's running under. You should list the relevant sections of - your &smb.conf; file, at least the options in [global] + your &smb.conf; file, at least the options in that affect PDC support. diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml index 028762dfc7..8b137dd4ef 100644 --- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml +++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml @@ -75,8 +75,7 @@ For example, to support Windows NT4/200x clients, set the following in the [glob - -\\profileserver\profileshare\profilepath\%U\moreprofilepath + \\profileserver\profileshare\profilepath\%U\moreprofilepath This is typically implemented like: @@ -98,7 +97,7 @@ semantics of %L and %N, as well as %U MS Windows NT/200x clients at times do not disconnect a connection to a server between logons. It is recommended -to not use the homes meta-service name as part of the profile share path. +to not use the meta-service name as part of the profile share path. @@ -115,7 +114,7 @@ on the logon home parameter. By using the logon home parameter, you are restricted to putting Windows 9x/Me profiles in the user's home directory. But wait! There is a trick you can use. If you set the following in the -[global] section of your &smb.conf; file: + section of your &smb.conf; file: \\%L\%U\.profiles @@ -229,7 +228,7 @@ When a user first logs in on Windows 9X, the file user.DAT is created, as are fo Start Menu, Desktop, Programs, and Nethood. These directories and their contents will be merged with the local versions stored in c:\windows\profiles\username on subsequent logins, taking the -most recent from each. You will need to use the [global] options +most recent from each. You will need to use the options yes, yes and no @@ -861,7 +860,7 @@ exists there it will copy this to the workstation to the C:\Documents under the Windows login name of the user. This path translates, in Samba parlance, to the &smb.conf; -[NETLOGON] share. The directory should be created at the root + share. The directory should be created at the root of this share and must be called Default User. @@ -1099,14 +1098,14 @@ setting in &smb.conf;: Yes - There must be a [netlogon] share that is world readable. It is + There must be a share that is world readable. It is a good idea to add a logon script to pre-set printer and drive connections. There is also a facility for automatically synchronizing the workstation time clock with that of the logon server (another good thing to do). To invoke auto-deletion of roaming profile from the local workstation cache (disk storage), use the Group Policy Editor to create a file called NTConfig.POL -with the appropriate entries. This file needs to be located in the netlogon +with the appropriate entries. This file needs to be located in the share root directory. Windows clients need to be members of the domain. Workgroup machines do not use network logons diff --git a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml index b7c8882151..a8c2811511 100644 --- a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml +++ b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml @@ -62,7 +62,7 @@ access to the UNIX host system. Samba 3.0.11 introduces support for the Windows privilege model. This model allows certain rights to be assigned to a user or group SID. In order to enable this feature, yes -must be defined in the global section of the &smb.conf; file. +must be defined in the section of the &smb.conf; file. diff --git a/docs/Samba-HOWTO-Collection/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml index 1157dcf599..b8d65c08ae 100644 --- a/docs/Samba-HOWTO-Collection/Securing.xml +++ b/docs/Samba-HOWTO-Collection/Securing.xml @@ -53,8 +53,8 @@ Samba may be secured from connections that originate from outside the local netw done using host-based protection (using Samba's implementation of a technology known as tcpwrappers, or it may be done be using interface-based exclusion so &smbd; will bind only to specifically permitted interfaces. It is also -possible to set specific share or resource-based exclusions, for example on the [IPC$] -auto-share. The [IPC$] share is used for browsing purposes as well as to establish +possible to set specific share or resource-based exclusions, for example on the +auto-share. The share is used for browsing purposes as well as to establish TCP/IP connections. @@ -112,7 +112,7 @@ before someone will find yet another vulnerability. If you want to restrict access to your server to valid users only, then the following - method may be of use. In the &smb.conf; [global] section put: + method may be of use. In the &smb.conf; section put: @@ -211,7 +211,7 @@ before someone will find yet another vulnerability. -[IPC$] + 192.168.115.0/24 127.0.0.1 0.0.0.0/0 @@ -344,7 +344,7 @@ out to be a security problem request are totally convinced that the problem is w Samba allows the behavior you require. Simply put the %S - option in the [homes] share definition. + option in the share definition. @@ -357,7 +357,7 @@ out to be a security problem request are totally convinced that the problem is w %S - to the definition of the [homes] share, as recommended in + to the definition of the share, as recommended in the &smb.conf; man page. diff --git a/docs/Samba-HOWTO-Collection/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml index 1505765297..ad1b69e79e 100644 --- a/docs/Samba-HOWTO-Collection/StandAloneServer.xml +++ b/docs/Samba-HOWTO-Collection/StandAloneServer.xml @@ -105,13 +105,13 @@ UNIX system database. This is a simple system to administer. smb.conf for Reference Documentation Server Global parameters -[global] + &example.workgroup; &example.server.samba; SHARE guest 192.168.1.1 -[data] + Data /export Yes @@ -197,7 +197,7 @@ The contents of the &smb.conf; file is shown in the n &smb.conf; for Anonymous Printing Global parameters -[global] + &example.workgroup; &example.server.samba; SHARE @@ -205,7 +205,7 @@ The contents of the &smb.conf; file is shown in the n cups cups -[printers] + All Printers /var/spool/samba root diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml index cf29ef2b7a..a858a38508 100644 --- a/docs/Samba-HOWTO-Collection/Unicode.xml +++ b/docs/Samba-HOWTO-Collection/Unicode.xml @@ -375,14 +375,12 @@ Setting up Japanese charsets is quite difficult. This is mainly because: VFS CAP -[global] + the locale name "CP932" may be different CP932 CP932 -... - -[cap-share] + cap diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml index 73244b4c8f..b4b87b5521 100644 --- a/docs/Samba-HOWTO-Collection/VFS.xml +++ b/docs/Samba-HOWTO-Collection/VFS.xml @@ -42,7 +42,7 @@ to files and put deleted files in a recycle bin, see ne smb.conf with VFS modules - [audit] + Audited /data directory /data audit recycle @@ -72,7 +72,7 @@ This can be done using a configuration similar to the one shown in smb.conf with multiple VFS modules -[test] + VFS TEST /data yes @@ -505,7 +505,7 @@ This can be done using a configuration similar to the one shown in Share With shadow_copy VFS - [shadow_share] + Shadow Copy Enabled Share /data/shadow_share shadow_copy diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index 21ed578fa8..bc95cef68a 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -576,10 +576,9 @@ linkend="winbindcfg">the next example, was modified to include the necess - + smb.conf for Winbind set-up -[global] -<...> + separate domain and username with '\', like DOMAIN\username \ use uids from 10000 to 20000 for domain users diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml index 05fffd0457..3a36e2c553 100644 --- a/docs/Samba-HOWTO-Collection/glossary.xml +++ b/docs/Samba-HOWTO-Collection/glossary.xml @@ -81,8 +81,10 @@ Extended Meta-file Format EMF + An intermediate file format used by Microsoft Windows-based servers and clients. EMF files may be - rendered into a page description language by a print processor. + rendered into a page description language by a print processor. + @@ -176,9 +178,11 @@ Portable Document Format PDF + A highly compressed document format, based on postscript, used as a document distribution format that is supported by Web browsers as well as many applications. Adobe also distribute an application called acrobat which is a PDF reader. + diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml index abf8747968..2aa6b622a2 100644 --- a/docs/Samba-HOWTO-Collection/locking.xml +++ b/docs/Samba-HOWTO-Collection/locking.xml @@ -600,7 +600,7 @@ You can disable oplocks on a per-share basis with the following: -[acctdata] + False False @@ -669,10 +669,10 @@ enabled on a per-share basis, or globally for the entire server, in the Share with some files oplocked -[global] + /filename.htm/*.txt/ -[share_name] + /*.exe/filename.ext/ @@ -702,10 +702,10 @@ the entire server, in the &smb.conf; file as shown in . Configuration with oplock break contention limit -[global] + 2 (default) -[share_name] + 2 (default) diff --git a/docs/Samba-HOWTO-Collection/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml index 49a9dc3563..126edd0eb6 100644 --- a/docs/Samba-HOWTO-Collection/msdfs.xml +++ b/docs/Samba-HOWTO-Collection/msdfs.xml @@ -64,11 +64,11 @@ smb.conf with DFS configured -[global] + &example.server.samba; yes -[dfs] + /export/dfsroot yes diff --git a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml index f3ce457be7..fa87a220ea 100644 --- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml +++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml @@ -587,7 +587,7 @@ complete descriptions of new or modified parameters. - [global] + ... ldap:ldap://onterose/ ou=idmap,dc=quenya,dc=org diff --git a/docs/configure.in b/docs/configure.in index 5eec1688e8..e240373a2d 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -87,7 +87,7 @@ DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages]) DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson]) DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker]) DOCS_DEFINE_TARGET(VERIFY, ALL, [verifying docbook output], [verify]) -DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fopdf]) +DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fo-pdf]) DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi]) DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo]) DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented]) diff --git a/docs/manpages/smb.conf.5.xml b/docs/manpages/smb.conf.5.xml index 57a5d62bc0..4e42e67b50 100644 --- a/docs/manpages/smb.conf.5.xml +++ b/docs/manpages/smb.conf.5.xml @@ -104,7 +104,7 @@ The share is accessed via the share name foo: - [foo] + /home/bar read only = no @@ -117,7 +117,7 @@ elsewhere): - [aprinter] + /usr/spool/public yes yes @@ -187,7 +187,7 @@ section: - [homes] + no @@ -249,7 +249,7 @@ this: - [printers] + /usr/spool/public yes yes diff --git a/docs/xslt/upgrade.pl b/docs/xslt/upgrade.pl index 369d76e55d..bcd9d2f6ec 100644 --- a/docs/xslt/upgrade.pl +++ b/docs/xslt/upgrade.pl @@ -6,6 +6,7 @@ undef $/; while(<>) { s/(.*?)<\/name>(.*?)<\/value><\/smbconfoption>/\2<\/smbconfoption>/g; s/(.*?)<\/name><\/smbconfoption>//g; + s/(.*?)<\/smbconfsection>//g; s/xmlns:samba=\"http:\/\/samba.org\/common\"/xmlns:samba=\"http:\/\/www.samba.org\/samba\/DTD\/samba-doc\"/g; print $_; } -- cgit