From 9c72dd78f25be4a7ffa5af5a242670ec76930d6f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 12 Mar 2005 22:34:38 +0000 Subject: Use new definition of , fixes a bunch of validity errors. (This used to be commit 3eb5c35e47951f320f7c2f4cd478a95f6d48236e) --- docs/Makefile | 8 +- .../Samba-Guide/Chap01-WindowsNetworkingPrimer.xml | 8 +- docs/Samba-Guide/Chap02-SimpleOfficeServer.xml | 102 +++--- docs/Samba-Guide/Chap03-TheSmallOffice.xml | 84 ++--- docs/Samba-Guide/Chap04-SecureOfficeServer.xml | 148 ++++---- docs/Samba-Guide/Chap05-500UserNetwork.xml | 178 +++++----- docs/Samba-Guide/Chap06-MakingHappyUsers.xml | 290 ++++++++-------- docs/Samba-Guide/Chap07-2000UserNetwork.xml | 288 ++++++++-------- docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml | 8 +- docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml | 266 +++++++-------- docs/Samba-Guide/Chap09-AddingUNIXClients.xml | 208 ++++++------ docs/Samba-Guide/Chap10-KerberosFastStart.xml | 4 +- docs/Samba-Guide/Chap10b-DomainAppsSupport.xml | 24 +- docs/Samba-HOWTO-Collection/AccessControls.xml | 130 +++---- docs/Samba-HOWTO-Collection/BDC.xml | 32 +- docs/Samba-HOWTO-Collection/Bugs.xml | 22 +- docs/Samba-HOWTO-Collection/CUPS-printing.xml | 184 +++++----- docs/Samba-HOWTO-Collection/Compiling.xml | 2 +- docs/Samba-HOWTO-Collection/Diagnosis.xml | 40 +-- docs/Samba-HOWTO-Collection/DomainMember.xml | 56 ++-- docs/Samba-HOWTO-Collection/FastStart.xml | 372 ++++++++++----------- docs/Samba-HOWTO-Collection/Group-Mapping.xml | 6 +- docs/Samba-HOWTO-Collection/Install.xml | 16 +- .../Integrating-with-Windows.xml | 6 +- docs/Samba-HOWTO-Collection/InterdomainTrusts.xml | 4 +- docs/Samba-HOWTO-Collection/LargeFile.xml | 2 +- docs/Samba-HOWTO-Collection/NT4Migration.xml | 2 +- docs/Samba-HOWTO-Collection/NetworkBrowsing.xml | 172 +++++----- docs/Samba-HOWTO-Collection/Other-Clients.xml | 22 +- docs/Samba-HOWTO-Collection/PAM.xml | 12 +- docs/Samba-HOWTO-Collection/PDC.xml | 82 ++--- docs/Samba-HOWTO-Collection/Passdb.xml | 118 +++---- docs/Samba-HOWTO-Collection/Printing.xml | 264 +++++++-------- docs/Samba-HOWTO-Collection/Problems.xml | 2 +- docs/Samba-HOWTO-Collection/ProfileMgmt.xml | 48 +-- .../Samba-HOWTO-Collection/RightsAndPriviliges.xml | 4 +- docs/Samba-HOWTO-Collection/SWAT.xml | 2 +- docs/Samba-HOWTO-Collection/Securing.xml | 26 +- docs/Samba-HOWTO-Collection/ServerType.xml | 54 +-- docs/Samba-HOWTO-Collection/Speed.xml | 26 +- docs/Samba-HOWTO-Collection/StandAloneServer.xml | 42 +-- docs/Samba-HOWTO-Collection/Unicode.xml | 34 +- docs/Samba-HOWTO-Collection/VFS.xml | 44 +-- docs/Samba-HOWTO-Collection/Winbind.xml | 24 +- .../Samba-HOWTO-Collection/WindowsClientConfig.xml | 2 +- docs/Samba-HOWTO-Collection/locking.xml | 32 +- docs/Samba-HOWTO-Collection/msdfs.xml | 12 +- docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml | 20 +- docs/manpages/nmbd.8.xml | 8 +- docs/manpages/ntlm_auth.1.xml | 6 +- docs/manpages/pdbedit.8.xml | 2 +- docs/manpages/rpcclient.1.xml | 2 +- docs/manpages/smb.conf.5.xml | 20 +- docs/manpages/smbd.8.xml | 4 +- docs/manpages/smbpasswd.8.xml | 2 +- docs/manpages/winbindd.8.xml | 24 +- docs/xslt/expand-sambadoc.xsl | 14 +- docs/xslt/generate-attributions.xsl | 3 +- docs/xslt/sambadoc2pearson.xsl | 8 +- docs/xslt/upgrade.pl | 10 + 60 files changed, 1821 insertions(+), 1814 deletions(-) create mode 100644 docs/xslt/upgrade.pl (limited to 'docs') diff --git a/docs/Makefile b/docs/Makefile index f918df1aa0..39ca5f38a6 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -65,7 +65,7 @@ htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR html-single: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%.html,$(MAIN_DOCS)) html: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS)) -validate: $(patsubst $(DOCBOOKDIR)/%.xml,$(VALIDATEDIR)/%.report.html,$(MAIN_DOCS)) +validate: $(patsubst $(DOCBOOKDIR)/%.xml,$(VALIDATEDIR)/%.report,$(MAIN_DOCS)) # Intermediate docbook docs @@ -222,12 +222,12 @@ $(PEARSONDIR)/%.xml: %/index.xml xslt/pearson.xsl $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml mkdir -p $(@D) - $(XMLLINT) --valid --noout --htmlout $< 2> $@ + -$(XMLLINT) --valid --noout $< 2> $@ # Validation verification -$(VALIDATEDIR)/%.report.html: %/index.xml +$(VALIDATEDIR)/%.report: %/index.xml mkdir -p $(@D) - $(XMLLINT) --xinclude --postvalid --noout --htmlout $< 2> $@ + -$(XMLLINT) --xinclude --postvalid --noout $< 2> $@ # Find undocumented parameters undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml index f3d39ad04c..bf8b636c92 100644 --- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml +++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml @@ -704,7 +704,7 @@ nobody Samba has a special name for the NULL, or empty, user account. - It calls that the guest account. The + It calls that the . The default value of this parameter is nobody; however, this can be changed to map the function of the guest account to any other UNIX identity. Some UNIX administrators prefer to map this account to the system default anonymous @@ -1128,7 +1128,7 @@ It should be noted that the guest account is essential to Samba operation. Either the operating system must have an account called nobody or there must be an entry in the &smb.conf; file with a valid UNIX account. For example, - guest accountftp. + ftp. @@ -1238,7 +1238,7 @@ - Is it necessary to specify encrypt passwordsYes + Is it necessary to specify Yes when Samba-3 is configured as a Domain Member? @@ -1266,7 +1266,7 @@ Yes. This is a local function on the server. The default setting is to use the UNIX account nobody. If this account does not exist on the UNIX server, then it is - necessary to provide a guest accountan_account, + necessary to provide a an_account, where an_account is a valid local UNIX user account. diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml index 9b39685ce0..a22b3825e3 100644 --- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml +++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml @@ -193,13 +193,13 @@ Drafting Office &smb.conf; File Global Parameters [global] -workgroupMIDEARTH -securitySHARE +MIDEARTH +SHARE [Plans] -path/plans -read onlyYes -guest okYes +/plans +Yes +Yes @@ -670,39 +670,39 @@ application/octet-stream Charity Administration Office &smb.conf; File Global Parameters [global] -workgroupMIDEARTH -securitySHARE -printingCUPS -printcap nameCUPS -disable spoolssYes -show add printer wizardNo -wins supportyes +MIDEARTH +SHARE +CUPS +CUPS +Yes +No +yes [FTMFILES] -commentFunds Tracking & Management Files -path/data/ftmfiles -read onlyNo -force userabmas -force groupoffice -guest okYes -nt acl supportNo +Funds Tracking & Management Files +/data/ftmfiles +No +abmas +office +Yes +No [office] -commentGeneral Office Files -path/data/officefiles -read onlyNo -force userabmas -force groupoffice -guest okYes -nt acl supportNo +General Office Files +/data/officefiles +No +abmas +office +Yes +No [printers] -commentPrint Temporary Spool Configuration -path/var/spool/samba -printableYes -guest okYes -use client driverYes -browseableNo +Print Temporary Spool Configuration +/var/spool/samba +Yes +Yes +Yes +No @@ -1283,31 +1283,31 @@ application/octet-stream Accounting Office Network &smb.conf; File Global parameters [global] -workgroupBILLMORE -printingCUPS -printcap nameCUPS -disable spoolssYes -show add printer wizardNo +BILLMORE +CUPS +CUPS +Yes +No [files] -commentWork area files -path/data/%U -valid users%S -read onlyNo +Work area files +/data/%U +%S +No [master] -commentMaster work area files -path/data -valid usersalan -read onlyNo +Master work area files +/data +alan +No [printers] -commentPrint Temporary Spool Configuration -path/var/spool/samba -printableYes -guest okYes -use client driverYes -browseableNo +Print Temporary Spool Configuration +/var/spool/samba +Yes +Yes +Yes +No diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml index d700a1850c..4b007acde2 100644 --- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml +++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml @@ -643,63 +643,63 @@ hosts: files wins Accounting Office Network &smb.conf; File &smbmdash; [globals] Section Global parameters [global] -workgroupBILLMORE -passwd chat*New*Password* \ +BILLMORE +*New*Password* \ %n\n*Re-enter*new*password* %n\n *Password*changed* -username map/etc/samba/smbusers -syslog0 -name resolve orderwins bcast hosts -printcap nameCUPS -show add printer wizardNo -add user script/usr/sbin/useradd -m '%u' -delete user script/usr/sbin/userdel -r '%u' -add group script/usr/sbin/groupadd '%g' -delete group script/usr/sbin/groupdel '%g' -add user to group script/usr/sbin/usermod -G '%g' '%u' -add machine script/usr/sbin/useradd \ +/etc/samba/smbusers +0 +wins bcast hosts +CUPS +No +/usr/sbin/useradd -m '%u' +/usr/sbin/userdel -r '%u' +/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' -logon scriptscripts\login.bat -logon path -logon driveX: -domain logonsYes -preferred masterYes -wins supportYes -printingCUPS +scripts\login.bat + +X: +Yes +Yes +Yes +CUPS Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -printableYes -guest okYes -use client driverYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +Yes +No [netlogon] -commentNetwork Logon Service -path/data/%U -valid users%S -read onlyNo +Network Logon Service +/data/%U +%S +No [accounts] -commentAccounting Files -path/data/accounts -valid users%G -read onlyNo +Accounting Files +/data/accounts +%G +No [finsvcs] -commentFinancial Service Files -path/data/finsvcs -valid users%G -read onlyNo +Financial Service Files +/data/finsvcs +%G +No diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml index 20103e0904..acbb25d03f 100644 --- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml +++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml @@ -511,7 +511,7 @@ Given 500 Users and 2 years: name resolve order - WINS serving is enabled by the wins supportYes, + WINS serving is enabled by the Yes, and name resolution is set to use it by means of the name resolve order wins bcast hosts entry. @@ -531,8 +531,8 @@ Given 500 Users and 2 years: Samba is configured to directly interface with CUPS via the direct internal interface that is provided by CUPS libraries. This is achieved with the - printingCUPS as well as the - printcap nameCUPS entries. + CUPS as well as the + CUPS entries. @@ -863,100 +863,100 @@ echo -e "\nNAT firewall done.\n" 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section Global parameters [global] -workgroupPROMISES -netbios nameDIAMOND -interfaceseth1, eth2, lo -bind interfaces onlyYes -passdb backendtdbsam -pam password changeYes -passwd chat*New*Password* %n\n *Re-enter*new*password* +PROMISES +DIAMOND +eth1, eth2, lo +Yes +tdbsam +Yes +*New*Password* %n\n *Re-enter*new*password* %n\n *Password*changed* -username map/etc/samba/smbusers -unix password syncYes -log level1 -syslog0 -log file/var/log/samba/%m -max log size50 -smb ports139 445 -name resolve orderwins bcast hosts -time serverYes -printcap nameCUPS -show add printer wizardNo -add user script/usr/sbin/useradd -m '%u' -delete user script/usr/sbin/userdel -r '%u' -add group script/usr/sbin/groupadd '%g' -delete group script/usr/sbin/groupdel '%g' -add user to group script/usr/sbin/usermod -G '%g' '%u' -add machine script/usr/sbin/useradd +/etc/samba/smbusers +Yes +1 +0 +/var/log/samba/%m +50 +139 445 +wins bcast hosts +Yes +CUPS +No +/usr/sbin/useradd -m '%u' +/usr/sbin/userdel -r '%u' +/usr/sbin/groupadd '%g' +/usr/sbin/groupdel '%g' +/usr/sbin/usermod -G '%g' '%u' +/usr/sbin/useradd -s /bin/false -d /tmp '%u' -shutdown script/var/lib/samba/scripts/shutdown.sh -abort shutdown script/sbin/shutdown -c -logon scriptscripts\logon.bat -logon path\\%L\profiles\%U -logon driveX: -logon home\\%L\%U -domain logonsYes -preferred masterYes -wins supportYes -utmpYes -map acl inheritYes -printingcups -veto files/*.eml/*.nws/*.{*}/ -veto oplock files/*.doc/*.xls/*.mdb/ +/var/lib/samba/scripts/shutdown.sh +/sbin/shutdown -c +scripts\logon.bat +\\%L\profiles\%U +X: +\\%L\%U +Yes +Yes +Yes +Yes +Yes +cups +/*.eml/*.nws/*.{*}/ +/*.doc/*.xls/*.mdb/ 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A [IPC$] -path/tmp -hosts allow192.168.1.0/24, 192.168.2.0/24, 127.0.0.1 -hosts deny0.0.0.0/0 +/tmp +192.168.1.0/24, 192.168.2.0/24, 127.0.0.1 +0.0.0.0/0 [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -use client driverYes -default devmodeYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +Yes +Yes +No [netlogon] -commentNetwork Logon Service -path/var/lib/samba/netlogon -guest okYes -lockingNo +Network Logon Service +/var/lib/samba/netlogon +Yes +No 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B [profiles] -commentProfile Share -path/var/lib/samba/profiles -read onlyNo -profile aclsYes +Profile Share +/var/lib/samba/profiles +No +Yes [accounts] -commentAccounting Files -path/data/accounts -read onlyNo +Accounting Files +/data/accounts +No [service] -commentFinancial Services Files -path/data/service -read onlyNo +Financial Services Files +/data/service +No [apps] -commentApplication Files -path/apps -read onlyYes -admin usersbjordan +Application Files +/apps +Yes +bjordan @@ -2579,7 +2579,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds - Why does the &smb.conf; file in this exercise include an entry for smb ports? + Why does the &smb.conf; file in this exercise include an entry for ? diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml index 47d1b21d5a..b904d64393 100644 --- a/docs/Samba-Guide/Chap05-500UserNetwork.xml +++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml @@ -939,41 +939,41 @@ hosts: files dns wins Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename> Global parameters [global] -workgroupMEGANET -netbios nameMASSIVE -interfaceseth1, lo -bind interfaces onlyYes -passdb backendtdbsam -add user script/usr/sbin/useradd -m '%u' -delete user script/usr/sbin/userdel -r '%u' -add group script/usr/sbin/groupadd '%g' -delete group script/usr/sbin/groupdel '%g' -add user to group script/usr/sbin/usermod -G '%g' '%u' -add machine script/usr/sbin/ +MEGANET +MASSIVE +eth1, lo +Yes +tdbsam +/usr/sbin/useradd -m '%u' +/usr/sbin/userdel -r '%u' +/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' -preferred masterYes -wins supportYes -include/etc/samba/dc-common.conf +Yes +Yes +/etc/samba/dc-common.conf [IPC$] -path/tmp -hosts allow172.16.0.0/16, 127.0.0.1 -hosts deny0.0.0.0/0 +/tmp +172.16.0.0/16, 127.0.0.1 +0.0.0.0/0 [accounts] -commentAccounting Files -path/data/accounts -read onlyNo +Accounting Files +/data/accounts +No [service] -commentFinancial Services Files -path/data/service -read onlyNo +Financial Services Files +/data/service +No [pidata] -commentProperty Insurance Files -path/data/pidata -read onlyNo +Property Insurance Files +/data/pidata +No @@ -981,73 +981,73 @@ hosts: files dns wins Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename> Global parameters [global] -shutdown script/var/lib/samba/scripts/shutdown.sh -abort shutdown script/sbin/shutdown -c -logon scriptscripts\logon.bat -logon path\%L\profiles\%U -logon driveX: -logon home\%L\%U -domain logonsYes -preferred masterYes -include/etc/samba/common.conf +/var/lib/samba/scripts/shutdown.sh +/sbin/shutdown -c +scripts\logon.bat +\%L\profiles\%U +X: +\%L\%U +Yes +Yes +/etc/samba/common.conf [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [netlogon] -commentNetwork Logon Service -path/var/lib/samba/netlogon -guest okYes -lockingNo +Network Logon Service +/var/lib/samba/netlogon +Yes +No [profiles] -commentProfile Share -path/var/lib/samba/profiles -read onlyNo -profile aclsYes +Profile Share +/var/lib/samba/profiles +No +Yes Common Samba Configuration File: <filename>/etc/samba/common.conf</filename> [global] -username map/etc/samba/smbusers -log level1 -syslog0 -log file/var/log/samba/%m -max log size50 -smb ports139 445 -name resolve orderwins bcast hosts -time serverYes -printcap nameCUPS -show add printer wizardNo -shutdown script/var/lib/samba/scripts/shutdown.sh -abort shutdown script/sbin/shutdown -c -utmpYes -map acl inheritYes -printingcups -veto files/*.eml/*.nws/*.{*}/ -veto oplock files/*.doc/*.xls/*.mdb/ -include +/etc/samba/smbusers +1 +0 +/var/log/samba/%m +50 +139 445 +wins bcast hosts +Yes +CUPS +No +/var/lib/samba/scripts/shutdown.sh +/sbin/shutdown -c +Yes +Yes +cups +/*.eml/*.nws/*.{*}/ +/*.doc/*.xls/*.mdb/ + Share and Service Definitions are common to all servers [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -use client driverYes -default devmodeYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +Yes +Yes +No [apps] -commentApplication Files -path/apps -admin usersbjordan -read onlyNo +Application Files +/apps +bjordan +No @@ -1055,9 +1055,9 @@ hosts: files dns wins Server: BLDG1 (Member), File: smb.conf Global parameters [global] -workgroupMEGANET -netbios nameBLDG1 -include/etc/samba/dom-mem.conf +MEGANET +BLDG1 +/etc/samba/dom-mem.conf @@ -1065,9 +1065,9 @@ hosts: files dns wins Server: BLDG2 (Member), File: smb.conf Global parameters [global] -workgroupMEGANET -netbios nameBLDG2 -include/etc/samba/dom-mem.conf +MEGANET +BLDG2 +/etc/samba/dom-mem.conf @@ -1075,13 +1075,13 @@ hosts: files dns wins Common Domain Member Include File: dom-mem.conf Global parameters [global] -shutdown script/var/lib/samba/scripts/shutdown.sh -abort shutdown script/sbin/shutdown -c -preferred masterYes -wins server172.16.0.1 -idmap uid15000-20000 -idmap gid15000-20000 -include/etc/samba/common.conf +/var/lib/samba/scripts/shutdown.sh +/sbin/shutdown -c +Yes +172.16.0.1 +15000-20000 +15000-20000 +/etc/samba/common.conf diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml index b3df50ef87..55da147007 100644 --- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml +++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml @@ -1848,56 +1848,56 @@ 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] - unix charsetLOCALE - workgroupMEGANET2 - netbios nameMASSIVE - interfaceseth1, lo - bind interfaces onlyYes - passdb backendldapsam:ldap://massive.abmas.biz - enable privilegesYes - username map/etc/samba/smbusers - log level1 - syslog0 - log file/var/log/samba/%m - max log size50 - smb ports139 445 - name resolve orderwins bcast hosts - time serverYes - printcap nameCUPS - show add printer wizardNo - add user script/opt/IDEALX/sbin/smbldap-useradd -m "%u" - delete user script/opt/IDEALX/sbin/smbldap-userdel "%u" - add group script/opt/IDEALX/sbin/smbldap-groupadd -p "%g" - delete group script/opt/IDEALX/sbin/smbldap-groupdel "%g" - add user to group script/opt/IDEALX/sbin/ + LOCALE + MEGANET2 + MASSIVE + eth1, lo + Yes + ldapsam:ldap://massive.abmas.biz + Yes + /etc/samba/smbusers + 1 + 0 + /var/log/samba/%m + 50 + 139 445 + wins bcast hosts + Yes + CUPS + No + /opt/IDEALX/sbin/smbldap-useradd -m "%u" + /opt/IDEALX/sbin/smbldap-userdel "%u" + /opt/IDEALX/sbin/smbldap-groupadd -p "%g" + /opt/IDEALX/sbin/smbldap-groupdel "%g" + /opt/IDEALX/sbin/ smbldap-groupmod -m "%u" "%g" - delete user from group script/opt/IDEALX/sbin/ + /opt/IDEALX/sbin/ smbldap-groupmod -x "%u" "%g" - set primary group script/opt/IDEALX/sbin/ + /opt/IDEALX/sbin/ smbldap-usermod -g "%g" "%u" - add machine script/opt/IDEALX/sbin/smbldap-useradd -w "%u" + /opt/IDEALX/sbin/smbldap-useradd -w "%u" LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part B - logon scriptscripts\logon.bat - logon path\\%L\profiles\%U - logon driveX: - domain logonsYes - preferred masterYes - wins supportYes - ldap suffixdc=abmas,dc=biz - ldap machine suffixou=People - ldap user suffixou=People - ldap group suffixou=Groups - ldap idmap suffixou=Idmap - ldap admin dncn=Manager,dc=abmas,dc=biz - idmap backendldap:ldap://massive.abmas.biz - idmap uid10000-20000 - idmap gid10000-20000 - map acl inheritYes - printingcups - printer adminroot, chrisr + scripts\logon.bat + \\%L\profiles\%U + X: + Yes + Yes + Yes + dc=abmas,dc=biz + ou=People + ou=People + ou=Groups + ou=Idmap + cn=Manager,dc=abmas,dc=biz + ldap:ldap://massive.abmas.biz + 10000-20000 + 10000-20000 + Yes + cups + root, chrisr @@ -3207,37 +3207,37 @@ smb: \> q LDAP Based &smb.conf; File, Server: BLDG1 Global parameters [global] - unix charsetLOCALE - workgroupMEGANET2 - netbios nameBLDG1 - passdb backendldapsam:ldap://massive.abmas.biz - enable privilegesYes - username map/etc/samba/smbusers - log level1 - syslog0 - log file/var/log/samba/%m - max log size50 - smb ports139 445 - name resolve orderwins bcast hosts - printcap nameCUPS - show add printer wizardNo - logon scriptscripts\logon.bat - logon path\\%L\profiles\%U - logon driveX: - domain logonsYes - domain masterNo - wins server172.16.0.1 - ldap suffixdc=abmas,dc=biz - ldap machine suffixou=People - ldap user suffixou=People - ldap group suffixou=Groups - ldap idmap suffixou=Idmap - ldap admin dncn=Manager,dc=abmas,dc=biz - idmap backendldap:ldap://massive.abmas.biz - idmap uid10000-20000 - idmap gid10000-20000 - printingcups - printer adminroot, chrisr + LOCALE + MEGANET2 + BLDG1 + ldapsam:ldap://massive.abmas.biz + Yes + /etc/samba/smbusers + 1 + 0 + /var/log/samba/%m + 50 + 139 445 + wins bcast hosts + CUPS + No + scripts\logon.bat + \\%L\profiles\%U + X: + Yes + No + 172.16.0.1 + dc=abmas,dc=biz + ou=People + ou=People + ou=Groups + ou=Idmap + cn=Manager,dc=abmas,dc=biz + ldap:ldap://massive.abmas.biz + 10000-20000 + 10000-20000 + cups + root, chrisr @@ -3245,104 +3245,104 @@ smb: \> q LDAP Based &smb.conf; File, Server: BLDG2 Global parameters [global] - unix charsetLOCALE - workgroupMEGANET2 - netbios nameBLDG2 - passdb backendldapsam:ldap://massive.abmas.biz - enable privilegesYes - username map/etc/samba/smbusers - log level1 - syslog0 - log file/var/log/samba/%m - max log size50 - smb ports139 445 - name resolve orderwins bcast hosts - printcap nameCUPS - show add printer wizardNo - logon scriptscripts\logon.bat - logon path\\%L\profiles\%U - logon driveX: - domain logonsYes - domain masterNo - wins server172.16.0.1 - ldap suffixdc=abmas,dc=biz - ldap machine suffixou=People - ldap user suffixou=People - ldap group suffixou=Groups - ldap idmap suffixou=Idmap - ldap admin dncn=Manager,dc=abmas,dc=biz - idmap backendldap:ldap://massive.abmas.biz - idmap uid10000-20000 - idmap gid10000-20000 - printingcups - printer adminroot, chrisr + LOCALE + MEGANET2 + BLDG2 + ldapsam:ldap://massive.abmas.biz + Yes + /etc/samba/smbusers + 1 + 0 + /var/log/samba/%m + 50 + 139 445 + wins bcast hosts + CUPS + No + scripts\logon.bat + \\%L\profiles\%U + X: + Yes + No + 172.16.0.1 + dc=abmas,dc=biz + ou=People + ou=People + ou=Groups + ou=Idmap + cn=Manager,dc=abmas,dc=biz + ldap:ldap://massive.abmas.biz + 10000-20000 + 10000-20000 + cups + root, chrisr LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A [accounts] - commentAccounting Files - path/data/accounts - read onlyNo + Accounting Files + /data/accounts + No [service] - commentFinancial Services Files - path/data/service - read onlyNo + Financial Services Files + /data/service + No [pidata] - commentProperty Insurance Files - path/data/pidata - read onlyNo + Property Insurance Files + /data/pidata + No [homes] - commentHome Directories - valid users%S - read onlyNo - browseableNo + Home Directories + %S + No + No [printers] - commentSMB Print Spool - path/var/spool/samba - guest okYes - printableYes - browseableNo + SMB Print Spool + /var/spool/samba + Yes + Yes + No LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B [apps] - commentApplication Files - path/apps - admin usersbjordan - read onlyNo + Application Files + /apps + bjordan + No [netlogon] - commentNetwork Logon Service - path/var/lib/samba/netlogon - guest okYes - lockingNo + Network Logon Service + /var/lib/samba/netlogon + Yes + No [profiles] - commentProfile Share - path/var/lib/samba/profiles - read onlyNo - profile aclsYes + Profile Share + /var/lib/samba/profiles + No + Yes [profdata] - commentProfile Data Share - path/var/lib/samba/profdata - read onlyNo - profile aclsYes + Profile Data Share + /var/lib/samba/profdata + No + Yes [print$] - commentPrinter Drivers - path/var/lib/samba/drivers - browseableyes - guest okno - read onlyyes - write listroot, chrisr + Printer Drivers + /var/lib/samba/drivers + yes + no + yes + root, chrisr diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml index 68457abaf3..c349fa3ef7 100644 --- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml +++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml @@ -1152,209 +1152,209 @@ index default sub Primary Domain Controller &smb.conf; File &smbmdash; Part A Global parameters [global] -unix charsetLOCALE -workgroupMEGANET2 -passdb backendldapsam:ldap://massive.abmas.biz -username map/etc/samba/smbusers -log level1 -syslog0 -log file/var/log/samba/%m -max log size0 -smb ports139 445 -name resolve orderwins bcast hosts -time serverYes -printcap nameCUPS -add user script/var/lib/samba/sbin/smbldap-useradd.pl -m '%u' -delete user script/var/lib/samba/sbin/smbldap-userdel.pl '%u' -add group script/var/lib/samba/sbin/smbldap-groupadd.pl -p '%g' -delete group script/var/lib/samba/sbin/smbldap-groupdel.pl '%g' -add user to group script/var/lib/samba/sbin/ +LOCALE +MEGANET2 +ldapsam:ldap://massive.abmas.biz +/etc/samba/smbusers +1 +0 +/var/log/samba/%m +0 +139 445 +wins bcast hosts +Yes +CUPS +/var/lib/samba/sbin/smbldap-useradd.pl -m '%u' +/var/lib/samba/sbin/smbldap-userdel.pl '%u' +/var/lib/samba/sbin/smbldap-groupadd.pl -p '%g' +/var/lib/samba/sbin/smbldap-groupdel.pl '%g' +/var/lib/samba/sbin/ smbldap-groupmod.pl -m '%g' '%u' -delete user from group script/var/lib/samba/sbin/ +/var/lib/samba/sbin/ smbldap-groupmod.pl -x '%g' '%u' -set primary group script/var/lib/samba/sbin/ +/var/lib/samba/sbin/ smbldap-usermod.pl -g '%g' '%u' -add machine script/var/lib/samba/sbin/ +/var/lib/samba/sbin/ smbldap-useradd.pl -w '%u' -shutdown script/var/lib/samba/scripts/shutdown.sh -abort shutdown script/sbin/shutdown -c -logon scriptscripts\logon.bat -logon path\\%L\profiles\%U -logon driveX: -domain logonsYes -domain masterYes -wins supportYes -ldap suffixdc=abmas,dc=biz -ldap machine suffixou=People -ldap user suffixou=People -ldap group suffixou=Groups -ldap idmap suffixou=Idmap -ldap admin dncn=Manager,dc=abmas,dc=biz -idmap backendldap://massive.abmas.biz -idmap uid10000-20000 -idmap gid10000-20000 -printer adminroot -printingcups +/var/lib/samba/scripts/shutdown.sh +/sbin/shutdown -c +scripts\logon.bat +\\%L\profiles\%U +X: +Yes +Yes +Yes +dc=abmas,dc=biz +ou=People +ou=People +ou=Groups +ou=Idmap +cn=Manager,dc=abmas,dc=biz +ldap://massive.abmas.biz +10000-20000 +10000-20000 +root +cups Primary Domain Controller &smb.conf; File &smbmdash; Part B [IPC$] -path/tmp +/tmp [accounts] -commentAccounting Files -path/data/accounts -read onlyNo +Accounting Files +/data/accounts +No [service] -commentFinancial Services Files -path/data/service -read onlyNo +Financial Services Files +/data/service +No [pidata] -commentProperty Insurance Files -path/data/pidata -read onlyNo +Property Insurance Files +/data/pidata +No [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +No Primary Domain Controller &smb.conf; File &smbmdash; Part C [apps] -commentApplication Files -path/apps -admin usersbjones -read onlyNo +Application Files +/apps +bjones +No [netlogon] -commentNetwork Logon Service -path/var/lib/samba/netlogon -admin usersroot, Administrator -guest okYes -lockingNo +Network Logon Service +/var/lib/samba/netlogon +root, Administrator +Yes +No [profiles] -commentProfile Share -path/var/lib/samba/profiles -read onlyNo -profile aclsYes +Profile Share +/var/lib/samba/profiles +No +Yes [profdata] -commentProfile Data Share -path/var/lib/samba/profdata -read onlyNo -profile aclsYes +Profile Data Share +/var/lib/samba/profdata +No +Yes [print$] -commentPrinter Drivers -path/var/lib/samba/drivers -write listroot -admin usersroot, Administrator +Printer Drivers +/var/lib/samba/drivers +root +root, Administrator Backup Domain Controller &smb.conf; File &smbmdash; Part A # Global parameters [global] -unix charsetLOCALE -workgroupMEGANET2 -netbios nameBLDG1 -passdb backendldapsam:ldap://lapdc.abmas.biz -username map/etc/samba/smbusers -log level1 -syslog0 -log file/var/log/samba/%m -max log size50 -smb ports139 445 -name resolve orderwins bcast hosts -printcap nameCUPS -show add printer wizardNo -logon scriptscripts\logon.bat -logon path\\%L\profiles\%U -logon driveX: -domain logonsYes -os level63 -domain masterNo -wins server192.168.2.1 -ldap suffixdc=abmas,dc=biz -ldap machine suffixou=People -ldap user suffixou=People -ldap group suffixou=Groups -ldap idmap suffixou=Idmap -ldap admin dncn=Manager,dc=abmas,dc=biz -utmpYes -idmap backendldap://massive.abmas.biz -idmap uid10000-20000 -idmap gid10000-20000 -printingcups +LOCALE +MEGANET2 +BLDG1 +ldapsam:ldap://lapdc.abmas.biz +/etc/samba/smbusers +1 +0 +/var/log/samba/%m +50 +139 445 +wins bcast hosts +CUPS +No +scripts\logon.bat +\\%L\profiles\%U +X: +Yes +63 +No +192.168.2.1 +dc=abmas,dc=biz +ou=People +ou=People +ou=Groups +ou=Idmap +cn=Manager,dc=abmas,dc=biz +Yes +ldap://massive.abmas.biz +10000-20000 +10000-20000 +cups [accounts] -commentAccounting Files -path/data/accounts -read onlyNo +Accounting Files +/data/accounts +No [service] -commentFinancial Services Files -path/data/service -read onlyNo +Financial Services Files +/data/service +No Backup Domain Controller &smb.conf; File &smbmdash; Part B [pidata] -commentProperty Insurance Files -path/data/pidata -read onlyNo +Property Insurance Files +/data/pidata +No [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +No [apps] -commentApplication Files -path/apps -admin usersbjones -read onlyNo +Application Files +/apps +bjones +No [netlogon] -commentNetwork Logon Service -path/var/lib/samba/netlogon -guest okYes -lockingNo +Network Logon Service +/var/lib/samba/netlogon +Yes +No [profiles] -commentProfile Share -path/var/lib/samba/profiles -read onlyNo -profile aclsYes +Profile Share +/var/lib/samba/profiles +No +Yes [profdata] -commentProfile Data Share -path/var/lib/samba/profdata -read onlyNo -profile aclsYes +Profile Data Share +/var/lib/samba/profdata +No +Yes diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml index 4611fc6187..eb1553bf4d 100644 --- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml +++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml @@ -416,7 +416,7 @@ BDC Edit the &smb.conf; file to temporarily change the parameter - domain masterNo so + No so the Samba server functions as a BDC for the purpose of migration. Also, temporarily (only during domain account migration) comment out the lines that specify deletion scripts (delete user script, etc.). @@ -597,7 +597,7 @@ SAM_DELTA_DOMAIN_INFO not handled PDC Edit the &smb.conf; file to reset the parameter - domain masterYes so that + Yes so that the Samba server functions as a PDC for the purpose of migration. @@ -664,7 +664,7 @@ gidNumber: 1000 BDC Edit the &smb.conf; file to temporarily change the parameter - domain masterNo so + No so the Samba server functions as a BDC for the purpose of migration. @@ -824,7 +824,7 @@ Users Ordinary users PDC Edit the &smb.conf; file to reset the parameter - domain masterYes so + Yes so the Samba server functions as a PDC for the purpose of migration. diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml index 0f3eefd99c..63994d84e8 100644 --- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml +++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml @@ -533,199 +533,199 @@ shadow: files ldap Samba Configuration File &smbmdash; smb.conf Part A Global parameters [global] -workgroupMEGANET2 -netbios nameMASSIVE -server stringCorp File Server -passdb backendldapsam:ldap://localhost -pam password changeYes -username map/etc/samba/smbusers -log level1 -log file/data/samba/log/%m.log -name resolve orderwins host bcast -time serverYes -printcap namecups -show add printer wizardNo -add user script/opt/IDEALX/sbin/smbldap-useradd -m "%u" -add group script/opt/IDEALX/sbin/smbldap-groupadd -p "%g" -add user to group script +MEGANET2 +MASSIVE +Corp File Server +ldapsam:ldap://localhost +Yes +/etc/samba/smbusers +1 +/data/samba/log/%m.log +wins host bcast +Yes +cups +No +/opt/IDEALX/sbin/smbldap-useradd -m "%u" +/opt/IDEALX/sbin/smbldap-groupadd -p "%g" + /opt/IDEALX/sbin/smbldap-groupmod -m "%u" "%g" -delete user from group script + /opt/IDEALX/sbin/smbldap-groupmod -x "%u" "%g" -set primary group script + /opt/IDEALX/sbin/smbldap-usermod -g "%g" "%u" -add machine script/usr/local/sbin/smbldap-useradd -w "%m" -logon scriptlogon.bat -logon path\\%L\profiles\%U\%a -logon driveH: -logon home\\%L\%U -domain logonsYes -wins supportYes -ldap admin dncn=Manager,dc=abmas,dc=biz -ldap group suffixou=Groups -ldap idmap suffixou=People -ldap machine suffixou=People -ldap passwd syncYes -ldap suffixou=MEGANET2,dc=abmas,dc=biz -ldap sslno -ldap user suffixou=People -admin usersroot, "@Domain Admins" -printer admin"@Domain Admins" -force printernameYes +/usr/local/sbin/smbldap-useradd -w "%m" +logon.bat +\\%L\profiles\%U\%a +H: +\\%L\%U +Yes +Yes +cn=Manager,dc=abmas,dc=biz +ou=Groups +ou=People +ou=People +Yes +ou=MEGANET2,dc=abmas,dc=biz +no +ou=People +root, "@Domain Admins" +"@Domain Admins" +Yes Samba Configuration File &smbmdash; smb.conf Part B [netlogon] -commentNetwork logon service -path/data/samba/netlogon -write list"@Domain Admins" -guest okYes +Network logon service +/data/samba/netlogon +"@Domain Admins" +Yes [profiles] -commentRoaming Profile Share -path/data/samba/profiles/ -read onlyNo -profile aclsYes -veto filesdesktop.ini -browseableNo +Roaming Profile Share +/data/samba/profiles/ +No +Yes +desktop.ini +No [homes] -commentHome Directories -valid users%S -read onlyNo -create mask0770 -veto filesdesktop.ini -hide filesdesktop.ini -browseableNo +Home Directories +%S +No +0770 +desktop.ini +desktop.ini +No [software] -commentSoftware for %a computers -path/data/samba/shares/software/%a -guest okYes +Software for %a computers +/data/samba/shares/software/%a +Yes [public] -commentPublic Files -path/data/samba/shares/public -read onlyNo -guest okYes +Public Files +/data/samba/shares/public +No +Yes [PDF] -commentLocation of documents printed to PDFCreator printer -path/data/samba/shares/pdf -guest okYes +Location of documents printed to PDFCreator printer +/data/samba/shares/pdf +Yes Samba Configuration File &smbmdash; smb.conf Part C [EVERYTHING] -commentAll shares -path/data/samba -valid users"@Domain Admins" -read onlyNo +All shares +/data/samba +"@Domain Admins" +No [CDROM] -commentCD-ROM on MASSIVE -path/mnt -guest okYes +CD-ROM on MASSIVE +/mnt +Yes [print$] -commentPrinter Drivers Share -path/data/samba/drivers -write listroot -browseableNo +Printer Drivers Share +/data/samba/drivers +root +No [printers] -commentAll Printers -path/data/samba/spool -create mask0644 -printableYes -browseableNo +All Printers +/data/samba/spool +0644 +Yes +No [acct_hp8500] -comment"Accounting Color Laser Printer" -path/data/samba/spool/private -valid users@acct, @acct_admin, @hr, "@Domain Admins",\ +"Accounting Color Laser Printer" +/data/samba/spool/private +@acct, @acct_admin, @hr, "@Domain Admins",\ @Receptionist, dwayne, terri, danae, jerry -create mask0644 -printableYes -copyprinters +0644 +Yes +printers [plotter] -commentEngineering Plotter -path/data/samba/spool -create mask0644 -printableYes -use client driverYes -copyprinters +Engineering Plotter +/data/samba/spool +0644 +Yes +Yes +printers Samba Configuration File &smbmdash; smb.conf Part D [APPS] -path/data/samba/shares/Apps -force group"Domain Users" -read onlyNo +/data/samba/shares/Apps +"Domain Users" +No [ACCT] -path/data/samba/shares/Accounting -valid users@acct, "@Domain Admins" -force groupacct -read onlyNo -create mask0660 -directory mask0770 +/data/samba/shares/Accounting +@acct, "@Domain Admins" +acct +No +0660 +0770 [ACCT_ADMIN] -path/data/samba/shares/Acct_Admin -valid users@”acct_admin” -force groupacct_admin +/data/samba/shares/Acct_Admin +@”acct_admin” +acct_admin [HR_PR] -path/data/samba/shares/HR_PR -valid users@hr, @acct_admin -force grouphr +/data/samba/shares/HR_PR +@hr, @acct_admin +hr [ENGR] -path/data/samba/shares/Engr -valid users@engr, @receptionist, @truss, "@Domain Admins", cheri -force groupengr -read onlyNo -create mask0770 +/data/samba/shares/Engr +@engr, @receptionist, @truss, "@Domain Admins", cheri +engr +No +0770 [DATA] -path/data/samba/shares/DATA -valid users@engr, @receptionist, @truss, "@Domain Admins", cheri -force groupengr -read onlyNo -create mask0770 -copyengr +/data/samba/shares/DATA +@engr, @receptionist, @truss, "@Domain Admins", cheri +engr +No +0770 +engr Samba Configuration File &smbmdash; smb.conf Part E [X] -path/data/samba/shares/X -valid users@engr, @acct -force groupengr -read onlyNo -create mask0770 -copyengr +/data/samba/shares/X +@engr, @acct +engr +No +0770 +engr [NETWORK] -path/data/samba/shares/network -valid users"@Domain Users" -read onlyNo -create mask0770 -guest okYes +/data/samba/shares/network +"@Domain Users" +No +0770 +Yes [UTILS] -path/data/samba/shares/Utils -write list"@Domain Admins" +/data/samba/shares/Utils +"@Domain Admins" [SYS] -path/data/samba/shares/SYS -valid userschad -read onlyNo -browseableNo +/data/samba/shares/SYS +chad +No +No diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml index 5cfc48d684..c09849f9d7 100644 --- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml +++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml @@ -201,7 +201,7 @@ mapping If the parameter - idmap backendldap:ldap://myserver.domain + ldap:ldap://myserver.domain was specified and the LDAP server has been configured with a container in which it may store the IDMAP entries, all Domain Members may share a common mapping. @@ -230,7 +230,7 @@ If you wish to make use of accounts (users and/or groups) that are local to (i.e., capable of being resolved using) the name service switch (NSS) facility, it is imperative to use the - winbind enable local accountsYes + Yes in the &smb.conf; file. This parameter specifically applies only to Domain Controllers, not to Domain Member servers. @@ -278,7 +278,7 @@ In the situation where UNIX accounts are held on the Domain Member server itself, the only effective way to use them involves the &smb.conf; entry - winbind trusted domains onlyYes. This forces + Yes. This forces Samba (smbd) to perform a getpwnam() system call that can then be controlled via /etc/nsswitch.conf file settings. The use of this parameter disables the use of Samba with Trusted Domains (i.e., External Domains). @@ -672,49 +672,49 @@ Joined domain MEGANET2. Samba Domain Member in Samba Domain Control Context &smbmdash; &smb.conf; File Global parameters [global] -unix charsetLOCALE -workgroupMEGANET2 -securityDOMAIN -username map/etc/samba/smbusers -log level10 -syslog0 -log file/var/log/samba/%m -max log size50 -smb ports139 445 -name resolve orderwins bcast hosts -printcap nameCUPS -wins server192.168.2.1 -ldap suffixdc=abmas,dc=biz -ldap machine suffixou=People -ldap user suffixou=People -ldap group suffixou=Groups -ldap idmap suffixou=Idmap -ldap admin dncn=Manager,dc=abmas,dc=biz -idmap backendldap:ldap://lapdc.abmas.biz -idmap uid10000-20000 -idmap gid10000-20000 -winbind trusted domains onlyYes -printer adminroot -printingcups +LOCALE +MEGANET2 +DOMAIN +/etc/samba/smbusers +10 +0 +/var/log/samba/%m +50 +139 445 +wins bcast hosts +CUPS +192.168.2.1 +dc=abmas,dc=biz +ou=People +ou=People +ou=Groups +ou=Idmap +cn=Manager,dc=abmas,dc=biz +ldap:ldap://lapdc.abmas.biz +10000-20000 +10000-20000 +Yes +root +cups [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +No [print$] -commentPrinter Drivers -path/var/lib/samba/drivers -admin usersroot, Administrator -write listroot +Printer Drivers +/var/lib/samba/drivers +root, Administrator +root @@ -970,45 +970,45 @@ MEGANET2+PIOps:x:10005: Samba Domain Member Server &smb.conf; File for NT4 Domain Global parameters [global] -unix charsetLOCALE -workgroupMEGANET2 -securityDOMAIN -username map/etc/samba/smbusers -log level1 -syslog0 -log file/var/log/samba/%m -max log size0 -smb ports139 445 -name resolve orderwins bcast hosts -printcap nameCUPS -wins server192.168.2.1 -idmap uid10000-20000 -idmap gid10000-20000 -template primary group"Domain Users" -template shell/bin/bash -winbind separator+ -printer adminroot -hosts allow192.168.2., 192.168.3., 127. -printingcups +LOCALE +MEGANET2 +DOMAIN +/etc/samba/smbusers +1 +0 +/var/log/samba/%m +0 +139 445 +wins bcast hosts +CUPS +192.168.2.1 +10000-20000 +10000-20000 +"Domain Users" +/bin/bash ++ +root +192.168.2., 192.168.3., 127. +cups [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +No [print$] -commentPrinter Drivers -path/var/lib/samba/drivers -admin usersroot, Administrator -write listroot +Printer Drivers +/var/lib/samba/drivers +root, Administrator +root @@ -1642,43 +1642,43 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- Samba Domain Member &smb.conf; File for Active Directory Membership Global parameters [global] -unix charsetLOCALE -workgroupLONDON -realmLONDON.ABMAS.BIZ -server stringSamba 3.0.12 -securityADS -username map/etc/samba/smbusers -log level1 -syslog0 -log file/var/log/samba/%m -max log size50 -printcap nameCUPS -ldap sslno -idmap uid10000-20000 -idmap gid10000-20000 -template primary group"Domain Users" -template shell/bin/bash -winbind separator+ -printingcups +LOCALE +LONDON +LONDON.ABMAS.BIZ +Samba 3.0.12 +ADS +/etc/samba/smbusers +1 +0 +/var/log/samba/%m +50 +CUPS +no +10000-20000 +10000-20000 +"Domain Users" +/bin/bash ++ +cups [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [printers] -commentSMB Print Spool -path/var/spool/samba -guest okYes -printableYes -browseableNo +SMB Print Spool +/var/spool/samba +Yes +Yes +No [print$] -commentPrinter Drivers -path/var/lib/samba/drivers -admin usersroot, Administrator -write listroot +Printer Drivers +/var/lib/samba/drivers +root, Administrator +root diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml index 02650ebb69..50be790e20 100644 --- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml +++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml @@ -1188,7 +1188,7 @@ On Domain Member servers and clients, even when the winbind use default domain has been specified, the use of Domain accounts in security controls requires fully qualified Domain specification, - for example, valid users@"MEGANET\Northern Engineers". + for example, @"MEGANET\Northern Engineers". Note the necessity to use the double quotes to avoid having the space in the Windows group name interpreted as a delimiter. @@ -1953,7 +1953,7 @@ other::r-x 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: - valid users%S. + %S. diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml index cd2894ec02..76dec83d14 100644 --- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml +++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml @@ -698,25 +698,25 @@ password: XXXXXXXX Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename> [global] -workgroupLONDON -netbios nameW2K3S -realmLONDON.ABMAS.BIZ -securityads -encrypt passwordsyes -password serverw2k3s.london.abmas.biz +LONDON +W2K3S +LONDON.ABMAS.BIZ +ads +yes +w2k3s.london.abmas.biz separate domain and username with '/', like DOMAIN/username -winbind separator/ +/ use UIDs from 10000 to 20000 for domain users -idmap uid10000-20000 +10000-20000 # use GIDs from 10000 to 20000 for domain groups -idmap gid10000-20000 +10000-20000 allow enumeration of winbind users and groups -winbind enum usersyes -winbind enum groupsyes -winbind user default domainyes +yes +yes +yes diff --git a/docs/Samba-HOWTO-Collection/AccessControls.xml b/docs/Samba-HOWTO-Collection/AccessControls.xml index a331429a23..decce45403 100644 --- a/docs/Samba-HOWTO-Collection/AccessControls.xml +++ b/docs/Samba-HOWTO-Collection/AccessControls.xml @@ -478,11 +478,11 @@ Before using any of the following options, please refer to the man page for &smb User and group-based controls can prove quite useful. In some situations it is distinctly desirable to affect all - file system operations as if a single user were doing so. The use of the force user and - force group behavior will achieve this. In other situations it may be necessary to effect a + file system operations as if a single user were doing so. The use of the and + behavior will achieve this. In other situations it may be necessary to effect a paranoia level of control to ensure that only particular authorized persons will be able to access a share or - its contents. Here the use of the valid users or the - invalid users may be most useful. + its contents. Here the use of the or the + may be most useful. @@ -508,7 +508,7 @@ Before using any of the following options, please refer to the man page for &smb - admin users + List of users who will be granted administrative privileges on the share. They will do all file operations as the super-user (root). @@ -517,59 +517,59 @@ Before using any of the following options, please refer to the man page for &smb - force group + Specifies a UNIX group name that will be assigned as the default primary group for all users connecting to this service. - force user + Specifies a UNIX user name that will be assigned as the default user for all users connecting to this service. This is useful for sharing files. Incorrect use can cause security problems. - guest ok + If this parameter is set for a service, then no password is required to connect to the service. Privileges will be those of the guest account. - invalid users + List of users that should not be allowed to login to this service. - only user + Controls whether connections with usernames not in the user list will be allowed. - read list + List of users that are given read-only access to a service. Users in this list will not be given write access, no matter what the read only option is set to. - username + Refer to the &smb.conf; man page for more information -- this is a complex and potentially misused parameter. - valid users + List of users that should be allowed to login to this service. - write list + List of users that are given read-write access to a service. @@ -607,67 +607,67 @@ Before using any of the following options, please refer to the man page for &smb - create mask + Refer to the &smb.conf; man page. - directory mask + The octal modes used when converting DOS modes to UNIX modes when creating UNIX directories. See also: directory security mask. - dos filemode + Enabling this parameter allows a user who has write access to the file to modify the permissions on it. - force create mode + This parameter specifies a set of UNIX mode bit permissions that will always be set on a file created by Samba. - force directory mode + This parameter specifies a set of UNIX mode bit permissions that will always be set on a directory created by Samba. - force directory security mode + Controls UNIX permission bits modified when a Windows NT client is manipulating UNIX permissions on a directory. - force security mode + Controls UNIX permission bits modified when a Windows NT client manipulates UNIX permissions. - hide unreadable + Prevents clients from seeing the existence of files that cannot be read. - hide unwriteable files + Prevents clients from seeing the existence of files that cannot be written to. Unwriteable directories are shown as usual. - nt acl support + This parameter controls whether smbd will attempt to map UNIX permissions into Windows NT access control lists. - security mask + Controls UNIX permission bits modified when a Windows NT client is manipulating the UNIX permissions on a file. @@ -699,9 +699,9 @@ Before using any of the following options, please refer to the man page for &smb - case sensitive, - default case, - short preserve case + , + , + This means that all file name lookup will be done in a case sensitive manner. @@ -709,32 +709,32 @@ Before using any of the following options, please refer to the man page for &smb - csc policy + Client Side Caching Policy - parallels MS Windows client side file caching capabilities. - dont descend + Allows specifying a comma-delimited list of directories that the server should always show as empty. - dos filetime resolution + This option is mainly used as a compatibility option for Visual C++ when used against Samba shares. - dos filetimes + DOS and Windows allow users to change file time stamps if they can write to the file. POSIX semantics prevent this. This option allows DOS and Windows behavior. - fake oplocks + Oplocks are the way that SMB clients get permission from a server to locally cache file operations. If a server grants an oplock, the client is free to assume that it is the only one accessing the file and it will aggressively cache file data. @@ -742,22 +742,22 @@ Before using any of the following options, please refer to the man page for &smb - hide dot files, - hide files, - veto files + , + , + Note: MS Windows Explorer allows over-ride of files marked as hidden so they will still be visible. - read only + If this parameter is yes, then users of a service may not create or modify files in the service's directory. - veto files + List of files and directories that are neither visible nor accessible. @@ -953,7 +953,7 @@ Before using any of the following options, please refer to the man page for &smb - If the parameter nt acl support is set to false, + If the parameter is set to false, the file owner will be shown as the NT user Everyone. @@ -991,7 +991,7 @@ Before using any of the following options, please refer to the man page for &smb GECOS field of the UNIX password database). - If the parameter nt acl support is set to false, + If the parameter is set to false, the file owner will be shown as the NT user Everyone and the permissions will be shown as NT Full Control. @@ -1049,7 +1049,7 @@ Before using any of the following options, please refer to the man page for &smb with the standard Samba permission masks and mapping of DOS attributes that need to also be taken into account. - If the parameter nt acl support + If the parameter is set to false, any attempt to set security permissions will fail with an `Access Denied' message. @@ -1097,10 +1097,10 @@ Before using any of the following options, please refer to the man page for &smb These are: - security mask - force security mode - directory security mask - force directory security mode + + + + @@ -1109,22 +1109,22 @@ Before using any of the following options, please refer to the man page for &smb permissions, Samba maps the given permissions into a user/group/world r/w/x triplet set, and then checks the changed permissions for a file against the bits set in the - security mask parameter. Any bits that + parameter. Any bits that were changed that are not set to 1 in this parameter are left alone in the file permissions. - Essentially, zero bits in the security mask + Essentially, zero bits in the may be treated as a set of bits the user is not allowed to change, and one bits are those the user is allowed to change. If not explicitly set, this parameter defaults to the same value as - the create mask parameter. To allow a user to modify all the + the parameter. To allow a user to modify all the user/group/world permissions on a file, set this parameter to 0777. Next Samba checks the changed permissions for a file against the bits set in the - force security mode parameter. Any bits + parameter. Any bits that were changed that correspond to bits set to 1 in this parameter are forced to be set. @@ -1132,10 +1132,10 @@ Before using any of the following options, please refer to the man page for &smb may be treated as a set of bits that, when modifying security on a file, the user has always set to be on. If not explicitly set, this parameter defaults to the same value - as the force create mode parameter. + as the parameter. To allow a user to modify all the user/group/world permissions on a file with no restrictions set this parameter to 000. The - security mask and force + and force security mode parameters are applied to the change request in that order. @@ -1146,11 +1146,11 @@ Before using any of the following options, please refer to the man page for &smb parameter instead of force security mode . - The directory security mask parameter + The parameter by default is set to the same value as the directory mask parameter and the force directory security mode parameter by default is set to the same value as - the force directory mode parameter. + the parameter. In this way Samba enforces the permission restrictions that an administrator can set on a Samba share, while still allowing users to modify the permission bits within that restriction. @@ -1162,10 +1162,10 @@ Before using any of the following options, please refer to the man page for &smb - security mask0777 - force security mode0 - directory security mask0777 - force directory security mode0 + 0777 + 0 + 0777 + 0 @@ -1305,8 +1305,8 @@ drwsrwsr-x 2 jack engr 48 2003-02-04 09:55 foodbar Now in your &smb.conf; for the share add: -force create mode0775 -force directory mode6775 +0775 +6775 @@ -1319,8 +1319,8 @@ drwsrwsr-x 2 jack engr 48 2003-02-04 09:55 foodbar An alternative is to set in the &smb.conf; entry for the share: -force userjack -force groupengr +jack +engr @@ -1332,8 +1332,8 @@ drwsrwsr-x 2 jack engr 48 2003-02-04 09:55 foodbar File Operations Done as <emphasis>root</emphasis> with <emphasis>force user</emphasis> Set - When you have a user in admin users, Samba will always do file operations for - this user as root, even if force user has been set. + When you have a user in , Samba will always do file operations for + this user as root, even if has been set. @@ -1362,8 +1362,8 @@ drwsrwsr-x 2 jack engr 48 2003-02-04 09:55 foodbar - force create mode0660 - force directory mode0770 + 0660 + 0770 diff --git a/docs/Samba-HOWTO-Collection/BDC.xml b/docs/Samba-HOWTO-Collection/BDC.xml index 8f9dd5efd4..cc9e9bcf16 100644 --- a/docs/Samba-HOWTO-Collection/BDC.xml +++ b/docs/Samba-HOWTO-Collection/BDC.xml @@ -253,10 +253,10 @@ Refer to following configuration for an exampl Minimal smb.conf for a PDC in Use With a BDC &smbmdash; LDAP Server on PDC. -workgroup&example.workgroup; -passdb backendldapsam://localhost:389 -domain masteryes -domain logonsyes +&example.workgroup; +ldapsam://localhost:389 +yes +yes @@ -310,7 +310,7 @@ unable to avoid such configurations, and these sites should review the sleep parameter, intended to slow down Samba sufficiently for the replication to catch up. This is a kludge, and one that the administrator must manually duplicate in any scripts (such as the -add machine script) that +) that they use. @@ -346,7 +346,7 @@ the secondary LDAP server in the &smb.conf; file as shown in Multiple LDAP Servers in &smb.conf; ... -passdb backend + ldapsam:"ldap://master.quenya.org ldap://slave.quenya.org" ... @@ -460,14 +460,14 @@ The creation of a BDC requires some steps to prepare the Samba server before - Specification of the ldap admin dn is obligatory. + Specification of the is obligatory. This also requires the LDAP administration password to be set in the secrets.tdb using the smbpasswd -w mysecret. - Either ldap suffix or - ldap idmap suffix must be specified in + Either or + must be specified in the &smb.conf; file. @@ -512,11 +512,11 @@ done by setting Samba as shown in the next example Minimal setup for being a BDC -workgroup&example.workgroup; -passdb backendldapsam:ldap://slave-ldap.quenya.org -domain masterno -domain logonsyes -idmap backendldap:ldap://slave-ldap.quenya.org +&example.workgroup; +ldapsam:ldap://slave-ldap.quenya.org +no +yes +ldap:ldap://slave-ldap.quenya.org @@ -524,7 +524,7 @@ In the [global]-section of the &smb.conf; of th only register the name MIDEARTH<#1c> with the WINS server. This is no problem as the name MIDEARTH<#1c> is a NetBIOS group name that is meant to be registered by more than one machine. The parameter -domain masterno +no forces the BDC not to register MIDEARTH<#1b> which as a unique NetBIOS name is reserved for the Primary Domain Controller. @@ -547,7 +547,7 @@ regarding its behavior. -The use of the idmap backendldap:ldap://master.quenya.org +The use of the ldap:ldap://master.quenya.org option on a BDC only make sense where ldapsam is used on a PDC. The purpose for an LDAP based idmap backend is also to allow a domain-member (without its own passdb backend) to use winbindd to resolve Windows network users and groups to common UID/GIDs. In other words, this option is generally intended for use on BDCs and on Domain diff --git a/docs/Samba-HOWTO-Collection/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml index 0f8378993f..2fd313c257 100644 --- a/docs/Samba-HOWTO-Collection/Bugs.xml +++ b/docs/Samba-HOWTO-Collection/Bugs.xml @@ -80,36 +80,36 @@ detail, but may use too much disk space. -To set the debug level, use the log level in your +To set the debug level, use the in your &smb.conf;. You may also find it useful to set the log level higher for just one machine and keep separate logs for each machine. To do this, add the following lines to your main &smb.conf; file: -log level10 -log file/usr/local/samba/lib/log.%m -include/usr/local/samba/lib/smb.conf.%m +10 +/usr/local/samba/lib/log.%m +/usr/local/samba/lib/smb.conf.%m and create a file /usr/local/samba/lib/smb.conf.machine where machine is the name of the client you wish to debug. In that file put any &smb.conf; commands you want, for example -log level may be useful. This also allows you to + may be useful. This also allows you to experiment with different security systems, protocol levels and so on, on just one machine. -The &smb.conf; entry log level -is synonymous with the parameter debuglevel that has +The &smb.conf; entry +is synonymous with the parameter that has been used in older versions of Samba and is being retained for backward compatibility of &smb.conf; files. -As the log level value is increased, you will record +As the value is increased, you will record a significantly greater level of debugging information. For most debugging operations, you may not need a setting higher than 3. Nearly @@ -128,9 +128,9 @@ prepared for a large volume of log data. -log level0 tdb:3 passdb:5 auth:4 vfs:2 -max log size0 -log file/var/log/samba/%U.%m.log +0 tdb:3 passdb:5 auth:4 vfs:2 +0 +/var/log/samba/%U.%m.log diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml index 3c80144a44..c842917225 100644 --- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml +++ b/docs/Samba-HOWTO-Collection/CUPS-printing.xml @@ -91,8 +91,8 @@ Printing with CUPS in the most basic &smb.conf; setup in Samba-3.0 (as was true for 2.2.x) only needs two - settings: printingcups and - printcapcups. CUPS does not need a printcap file. + settings: cups and + cups. CUPS does not need a printcap file. However, the cupsd.conf configuration file knows of two related directives that control how such a file will be automatically created and maintained by CUPS for the convenience of third-party applications (example: Printcap /etc/printcap and PrintcapFormat BSD). @@ -114,7 +114,7 @@ - When Samba is compiled against libcups, printcapcups + When Samba is compiled against libcups, cups uses the CUPS API to list printers, submit jobs, query queues, and so on. Otherwise it maps to the System V commands with an additional -oraw option for printing. On a Linux system, you can use the ldd utility to find out details (ldd may not be present on @@ -137,16 +137,16 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) Should it be necessary, for any reason, to set your own print commands, you can do this by setting - printingsysv. However, you will lose all the benefits + sysv. However, you will lose all the benefits of tight CUPS/Samba integration. When you do this you must manually configure the printing system commands (most important: - print command; other commands are - lppause command, - lpresume command, - lpq command, - lprm command, - queuepause command and - queue resume command). + ; other commands are + , + , + , + , + and + ). @@ -159,19 +159,19 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) Simplest printing-related smb.conf [global] - load printersyes - printingcups - printcap namecups + yes + cups + cups [printers] - commentAll Printers - path/var/spool/samba - browseableno - publicyes - guest okyes - writableno - printableyes - printer adminroot, @ntadmins + All Printers + /var/spool/samba + no + yes + yes + no + yes + root, @ntadmins @@ -206,45 +206,45 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) Overriding global CUPS settings for one printer [global] - printingcups - printcap namecups - load printersyes + cups + cups + yes [printers] - commentAll Printers - path/var/spool/samba - publicyes - guest okyes - writableno - printableyes - printer adminroot, @ntadmins + All Printers + /var/spool/samba + yes + yes + no + yes + root, @ntadmins [special_printer] - commentA special printer with his own settings - path/var/spool/samba-special - printingsysv - printcaplpstat - print commandecho "NEW: `date`: printfile %f" \ + A special printer with his own settings + /var/spool/samba-special + sysv + lpstat + echo "NEW: `date`: printfile %f" \ >> /tmp/smbprn.log ; \ echo " `date`: p-%p s-%s f-%f" >> /tmp/smbprn.log ; \ echo " `date`: j-%j J-%J z-%z c-%c" >> /tmp/smbprn.log ; rm %f - publicno - guest okno - writableno - printableyes - printer adminkurt - hosts deny0.0.0.0 - hosts allowturbo_xp, 10.160.50.23, 10.160.51.60 + no + no + no + yes + 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 known to Samba into the /tmp/smbprn.log file and deletes the job-file. Moreover, the - printer admin of this share is kurt (not the @ntadmins group), + of this share is kurt (not the @ntadmins group), guest access is not allowed, the share isn't published to the Network Neighborhood (so you need to know it is there), and it only allows access from only three hosts. To prevent CUPS kicking in and taking over the print jobs for that share, we need to set - printingsysv and - printcaplpstat. + sysv and + lpstat. @@ -337,10 +337,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) In the &smb.conf; file [printers] section add - use client driverYes, + Yes, and in the [global] section add - printingCUPS, plus - printcapCUPS. + CUPS, plus + CUPS. @@ -2140,13 +2140,13 @@ section: -printingcups -printcapcups +cups +cups When these parameters are specified, all manually set print directives -(like print command, or lppause command) in &smb.conf; (as well as +(like , or ) in &smb.conf; (as well as in Samba itself) will be ignored. Instead, Samba will directly interface with CUPS through its application program interface (API), as long as Samba has been compiled with CUPS library (libcups) @@ -2155,7 +2155,7 @@ other print commands are set up, then printing will use the System V AT&T command set, with the -oraw option automatically passing through (if you want your own defined print commands to work with a Samba that has CUPS support compiled in, -simply use printingsysv). +simply use sysv). @@ -2170,7 +2170,7 @@ simply use printingsysv Samba must use its own spool directory (it is set -by a line similar to path/var/spool/samba, +by a line similar to /var/spool/samba, in the [printers] or [printername] section of &smb.conf;). Samba receives the job in its own @@ -2454,27 +2454,27 @@ Prior to running cupsaddsmb, you need the settings in smb.conf for cupsaddsmb usage [global] -load printersyes -printingcups -printcap namecups +yes +cups +cups [printers] -commentAll Printers -path/var/spool/samba -browseableno -publicyes +All Printers +/var/spool/samba +no +yes setting depends on your requirements -guest okyes -writableno -printableyes -printer adminroot +yes +no +yes +root [print$] -commentPrinter Drivers -path/etc/samba/drivers -browseableyes -guest okno -read onlyyes -write listroot +Printer Drivers +/etc/samba/drivers +yes +no +yes +root @@ -2834,7 +2834,7 @@ associated with this printer is copied from Windows client installations via Point'n'Print. Before we can run the command successfully, we need to be sure that we can authenticate toward Samba. If you have a small network, you are probably using user-level -security (securityuser). +security (user). @@ -3037,7 +3037,7 @@ If you get: SetPrinter call failed! result was WERR_ACCESS_DENIED -It means that you might have set use client driveryes for this printer. +It means that you might have set yes for this printer. Set it to no will solve the problem. Refer to man samba(5) for explanantion on use client driver. @@ -3418,7 +3418,7 @@ preconditions to complete successfully: -You are connected as printer admin or root (this is not the Printer Operators group in +You are connected as or root (this is not the Printer Operators group in NT, but the printer admin group as defined in the [global] section of &smb.conf;). @@ -4903,7 +4903,7 @@ requested by marketing for the mailing, and so on). Samba print files pass through two spool directories. One is the incoming directory managed by Samba, (set in the -path/var/spool/samba +/var/spool/samba directive in the [printers] section of &smb.conf;). The other is the spool directory of your UNIX print subsystem. For CUPS it is normally @@ -4968,19 +4968,19 @@ things: on Linux by running ldd `which smbd'). A Samba-&smb.conf; setting of - printingcups. + cups. Another Samba-&smb.conf; setting of - printcapcups. + cups. In this case, all other manually set printing-related commands (like -print command, -lpq command, -lprm command, -lppause command or -lpresume command) are ignored and they should normally have no +, +, +, + or +) are ignored and they should normally have no influence whatsoever on your printing. @@ -4989,9 +4989,9 @@ influence whatsoever on your printing. Manual Configuration -If you want to do things manually, replace the printingcups -by printingbsd. Then your manually set commands may work -(I haven't tested this), and a print commandlp -d %P %s; rm %s" +If you want to do things manually, replace the cups +by bsd. Then your manually set commands may work +(I haven't tested this), and a lp -d %P %s; rm %s" may do what you need. @@ -5130,7 +5130,7 @@ Samba. <quote>cupsaddsmb</quote> Keeps Asking for Root Password in Never-ending Loop - Have you securityuser? Have + Have you user? Have you used smbpasswd to give root a Samba account? You can do two things: open another terminal and execute smbpasswd -a root to create the account and @@ -5189,7 +5189,7 @@ Samba. Once you are connected as the wrong user (for example, as nobody, which often occurs if you have -map to guestbad user), Windows Explorer will not accept an +bad user), Windows Explorer will not accept an attempt to connect again as a different user. There will not be any byte transfered on the wire to Samba, but still you'll see a stupid error message that makes you think Samba has denied access. Use @@ -5215,9 +5215,9 @@ printer in question and select You see per smbstatus that you are connected as user nobody; while you want to be root or printer admin. This is probably due to -map to guestbad user, which silently connects you under the guest account +bad user, which silently connects you under the guest account when you gave (maybe by accident) an incorrect username. Remove -map to guest, if you want to prevent +, if you want to prevent this. @@ -5368,7 +5368,7 @@ Do you see any difference? I don't either. However, only the last one, which you arrived at with steps C.1.-6., will save any settings permanently and be the defaults for new users. If you want all clients to get the same defaults, you need to conduct these steps as -Administrator (printer admin in +Administrator ( in &smb.conf;) before a client downloads the driver (the clients can later set their own per-user defaults by following the @@ -5407,7 +5407,7 @@ again. Have you ever by accident set the CUPS spool directory to the same location? (RequestRoot /var/spool/samba/ in cupsd.conf or the other way round: /var/spool/cups/ is set as -path> in the [printers] +> in the [printers] section). These must be different. Set RequestRoot /var/spool/cups/ in diff --git a/docs/Samba-HOWTO-Collection/Compiling.xml b/docs/Samba-HOWTO-Collection/Compiling.xml index a818222404..e882a65086 100644 --- a/docs/Samba-HOWTO-Collection/Compiling.xml +++ b/docs/Samba-HOWTO-Collection/Compiling.xml @@ -439,7 +439,7 @@ example of what you would not want to see would be: ifconfig On many systems you may need to use the - interfaces option in &smb.conf; to specify the IP + option in &smb.conf; to specify the IP address and netmask of your interfaces. Run ifconfig as root if you do not know what the broadcast is for your diff --git a/docs/Samba-HOWTO-Collection/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml index f6403dcf2c..2f55626683 100644 --- a/docs/Samba-HOWTO-Collection/Diagnosis.xml +++ b/docs/Samba-HOWTO-Collection/Diagnosis.xml @@ -58,9 +58,9 @@ lines shown in the next example. smb.conf with [tmp] share [tmp] -commenttemporary files -path/tmp -read onlyyes +temporary files +/tmp +yes @@ -244,10 +244,10 @@ the &smb.conf; file entries as shown in the next example< Configuration for only allowing connections from a certain subnet [globals] ... -hosts denyALL -hosts allowxxx.xxx.xxx.xxx/yy -interfaceseth0 -bind interfaces onlyYes +ALL +xxx.xxx.xxx.xxx/yy +eth0 +Yes ... @@ -263,9 +263,9 @@ To solve this problem, change these lines as shown in the Configuration for allowing connections from a certain subnet and localhost [globals] ... -hosts denyALL -hosts allowxxx.xxx.xxx.xxx/yy 127. -interfaceseth0 lo +ALL +xxx.xxx.xxx.xxx/yy 127. +eth0 lo ... @@ -347,7 +347,7 @@ messages from several hosts. If this does not give a similar result to the previous test, then nmblookup isn't correctly getting your broadcast address through its automatic mechanism. In this case you should experiment with the -interfaces option in &smb.conf; to manually configure your IP + option in &smb.conf; to manually configure your IP address, broadcast and netmask. @@ -400,19 +400,19 @@ If it says bad password, then the likely c - Your valid users configuration is incorrect. + Your configuration is incorrect. - You have a mixed case password and you haven't enabled the password level option at a high enough level. + You have a mixed case password and you haven't enabled the option at a high enough level. - The path line in &smb.conf; is incorrect. Check it with &testparm;. + The line in &smb.conf; is incorrect. Check it with &testparm;. @@ -502,7 +502,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 -userusername to the +username to the [tmp] section of &smb.conf; where username is the username corresponding to the password you typed. If you find this @@ -511,7 +511,7 @@ fixes things, you may need the username mapping option. It might also be the case that your client only sends encrypted passwords -and you have encrypt passwordsno in &smb.conf;. +and you have no in &smb.conf;. Change this to "yes" to fix this. @@ -530,7 +530,7 @@ master browser for that workgroup. If you do not, then the election process has failed. Wait a minute to see if it is just being slow, then try again. If it still fails after that, then look at the browsing options you have set in &smb.conf;. Make -sure you have preferred masteryes to ensure that +sure you have yes to ensure that an election is held at startup. @@ -546,9 +546,9 @@ of the server and get a list of shares. If you get the error message inva you are probably running Windows NT and it is refusing to browse a server that has no encrypted password capability and is in User Level Security mode. In this case, either set -securityserver and -password serverWindows_NT_Machine in your -&smb.conf; file, or make sure encrypt passwords is +server and +Windows_NT_Machine in your +&smb.conf; file, or make sure is set to yes. diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml index 649766b6c1..208c7cf235 100644 --- a/docs/Samba-HOWTO-Collection/DomainMember.xml +++ b/docs/Samba-HOWTO-Collection/DomainMember.xml @@ -122,7 +122,7 @@ as follows: A Domain Security Account (stored in the - passdb backend that has been configured in the + that has been configured in the &smb.conf; file. The precise nature of the account information that is stored depends on the type of backend database that has been chosen. @@ -276,7 +276,7 @@ information to such clients. You have been warned! Managing Domain Machine Accounts using NT4 Server Manager -A working add machine script is essential +A working is essential for machine trust accounts to be automatically created. This applies no matter whether one uses automatic account creation, or if one wishes to use the NT4 Domain Server Manager. @@ -370,7 +370,7 @@ Here is an example for a Red Hat Linux system. [global] <...remainder of parameters...> -add machine script/usr/sbin/useradd -d /var/lib/nobody -g 100 \ +/usr/sbin/useradd -d /var/lib/nobody -g 100 \ -s /bin/false -M %u @@ -405,7 +405,7 @@ with the version of Windows. The name of the account that is used to create Domain Member machine accounts can be anything the network administrator may choose. If it is other than root then this is easily mapped to root in the file named in the &smb.conf; parameter - username map/etc/samba/smbusers. + /etc/samba/smbusers. @@ -511,24 +511,24 @@ First, you must edit your &smb.conf; file to tell Samba it should now use domain Change (or add) your - security line in the [global] section + line in the [global] section of your &smb.conf; to read: -securitydomain +domain -Next change the workgroup line in the [global] +Next change the line in the [global] section to read: -workgroup&example.workgroup; +&example.workgroup; @@ -537,20 +537,20 @@ This is the name of the domain we are joining. -You must also have the parameter encrypt passwords +You must also have the parameter set to yes in order for your users to authenticate to the NT PDC. This is the default setting if this parameter is not specified. There is no need to specify this parameter, but if it is specified in the &smb.conf; file, it must be set to Yes. -Finally, add (or modify) a password server line in the [global] +Finally, add (or modify) a line in the [global] section to read: -password serverDOMPDC DOMBDC1 DOMBDC2 +DOMPDC DOMBDC1 DOMBDC2 @@ -570,7 +570,7 @@ set this line to be: -password server* +* @@ -661,7 +661,7 @@ to your server. This means that if Domain user DOM\fred attaches to your Domain Security Samba server, there needs to be a local UNIX user fred to represent that user in the UNIX file system. This is similar to the older Samba security mode -securityserver, +server, where Samba would pass through the authentication request to a Windows NT server in the same way as a Windows 95 or Windows 98 server would. @@ -682,11 +682,11 @@ domain PDC to an account domain PDC). -In addition, with securityserver, every Samba +In addition, with server, every Samba daemon on a server has to keep a connection open to the authenticating server for as long as that daemon lasts. This can drain the connection resources on a Microsoft NT server and cause it to run -out of available connections. With securitydomain, +out of available connections. With domain, however, the Samba daemons connect to the PDC/BDC only for as long as is necessary to authenticate the user and then drop the connection, thus conserving PDC connection resources. @@ -731,24 +731,24 @@ You must use at least the following three options in &smb.conf;: -realmyour.kerberos.REALM -securityADS +your.kerberos.REALM +ADS The following parameter need only be specified if present. The default setting is not present is Yes. -encrypt passwordsyes +yes In case samba cannot correctly identify the appropriate ADS server using the realm name, use the -password server option in &smb.conf;: + option in &smb.conf;: -password serveryour.kerberos.server +your.kerberos.server You do not need a smbpasswd file, and older clients will be authenticated as -if securitydomain, although it will not do any harm and +if domain, although it will not do any harm and allows you to have local users not in the domain. @@ -997,14 +997,14 @@ This may be needed in particular when sharing files over both CIFS and NFS. To use the LDAP ldap idmap suffix, set: -ldap idmap suffixou=Idmap,dc=quenya,dc=org +ou=Idmap,dc=quenya,dc=org -See the &smb.conf; man page entry for the ldap idmap suffix +See the &smb.conf; man page entry for the parameter for further information. -Do not forget to specify also the ldap admin dn +Do not forget to specify also the and to make certain to set the LDAP administrative password into the secrets.tdb using: &rootprompt; smbpasswd -w ldap-admin-password @@ -1053,9 +1053,9 @@ Please try again later.' Why? -You should check that there is an add machine script in your &smb.conf; +You should check that there is an in your &smb.conf; file. If there is not, please add one that is appropriate for your OS platform. If a script -has been defined, you will need to debug its operation. Increase the log level +has been defined, you will need to debug its operation. Increase the in the &smb.conf; file to level 10, then try to rejoin the domain. Check the logs to see which operation is failing. @@ -1088,7 +1088,7 @@ Possible causes include: -The add machine script does not create the +The does not create the machine account in the Samba backend database, it is there only to create a UNIX system account to which the Samba backend database account can be mapped. @@ -1099,7 +1099,7 @@ account to which the Samba backend database account can be mapped. I Can't Join a Windows 2003 PDC Windows 2003 requires SMB signing. Client side SMB signing has been implemented in Samba-3.0. - Set client use spnegoyes when communicating + Set yes when communicating with a Windows 2003 server. diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml index 66c7cec138..01ae9822c8 100644 --- a/docs/Samba-HOWTO-Collection/FastStart.xml +++ b/docs/Samba-HOWTO-Collection/FastStart.xml @@ -124,15 +124,15 @@ of the packages that are provided by the operating system vendor, or through oth Anonymous Read-Only Server Configuration Global parameters [global] - workgroupMIDEARTH - netbios nameHOBBIT - securityshare + MIDEARTH + HOBBIT + share [data] - commentData - path/export - read onlyYes - guest okYes + Data + /export + Yes + Yes @@ -260,17 +260,17 @@ Added user jackb. Modified Anonymous Read-Write smb.conf Global parameters [global] -workgroupMIDEARTH -netbios nameHOBBIT -securitySHARE +MIDEARTH +HOBBIT +SHARE [data] -commentData -path/export -force userjackb -force groupusers -read onlyNo -guest okYes +Data +/export +jackb +users +No +Yes @@ -313,21 +313,21 @@ Added user jackb. Anonymous Print Server smb.conf Global parameters [global] -workgroupMIDEARTH -netbios nameLUTHIEN -securityshare -printcap namecups -disable spoolssYes -show add printer wizardNo -printingcups +MIDEARTH +LUTHIEN +share +cups +Yes +No +cups [printers] -commentAll Printers -path/var/spool/samba -guest okYes -printableYes -use client driverYes -browseableNo +All Printers +/var/spool/samba +Yes +Yes +Yes +No @@ -407,7 +407,7 @@ Added user jackb. is the default, and for which the default is to store Microsoft Windows-compatible encrypted passwords in a file called /etc/samba/smbpasswd. The default &smb.conf; entry that makes this happen is: - passdb backendsmbpasswd, guest. Since this is the default + smbpasswd, guest. Since this is the default it is not necessary to enter it into the configuration file. Note that guest backend is added to the list of active passdb backends not matter was it specified directly in Samba configuration file or not. @@ -432,36 +432,36 @@ Added user jackb. Secure Office Server smb.conf Global parameters [global] -workgroupMIDEARTH -netbios nameOLORIN -printcap namecups -disable spoolssYes -show add printer wizardNo -printingcups +MIDEARTH +OLORIN +cups +Yes +No +cups [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [public] -commentData -path/export -force usermaryo -force groupusers -guest okYes -read onlyNo +Data +/export +maryo +users +Yes +No [printers] -commentAll Printers -path/var/spool/samba -printer adminroot, maryo -create mask0600 -guest okYes -printableYes -use client driverYes -browseableNo +All Printers +/var/spool/samba +root, maryo +0600 +Yes +Yes +Yes +No @@ -644,49 +644,49 @@ smb: \> q Member server smb.conf (globals) Global parameters [global] -workgroupMIDEARTH -netbios nameVALINOR -securityDOMAIN -printcap namecups -disable spoolssYes -show add printer wizardNo -idmap uid15000-20000 -idmap gid15000-20000 -winbind use default domainYes -use sendfileYes -printingcups +MIDEARTH +VALINOR +DOMAIN +cups +Yes +No +15000-20000 +15000-20000 +Yes +Yes +cups Member server smb.conf (shares and services) [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No [spytfull] -commentAccounting Application Only -path/export/spytfull -valid users@Accounts -admin usersmaryo -read onlyYes +Accounting Application Only +/export/spytfull +@Accounts +maryo +Yes [public] -commentData -path/export/public -read onlyNo +Data +/export/public +No [printers] -commentAll Printers -path/var/spool/samba -printer adminroot, maryo -create mask0600 -guest okYes -printableYes -use client driverYes -browseableNo +All Printers +/var/spool/samba +root, maryo +0600 +Yes +Yes +Yes +No @@ -872,72 +872,72 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false Engineering Office smb.conf (globals) [global] -workgroupMIDEARTH -netbios nameFRODO -passdb backendtdbsam -printcap namecups -add user script/usr/sbin/useradd -m %u -delete user script/usr/sbin/userdel -r %u -add group script/usr/sbin/groupadd %g -delete group script/usr/sbin/groupdel %g -add user to group script/usr/sbin/usermod -G %g %u -add machine script/usr/sbin/useradd -s /bin/false \ +MIDEARTH +FRODO +tdbsam +cups +/usr/sbin/useradd -m %u +/usr/sbin/userdel -r %u +/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 Note: The following specifies the default logon script. Per user logon scripts can be specified in the user account using pdbedit -logon scriptscripts\logon.bat +scripts\logon.bat This sets the default profile path. Set per user paths with pdbedit -logon path\\%L\Profiles\%U -logon driveH: -logon home\\%L\%U -domain logonsYes -os level35 -preferred masterYes -domain masterYes -idmap uid15000-20000 -idmap gid15000-20000 -printingcups +\\%L\Profiles\%U +H: +\\%L\%U +Yes +35 +Yes +Yes +15000-20000 +15000-20000 +cups Engineering Office smb.conf (shares and services) [homes] -commentHome Directories -valid users%S -read onlyNo -browseableNo +Home Directories +%S +No +No Printing auto-share (makes printers available thru CUPS) [printers] -commentAll Printers -path/var/spool/samba -printer adminroot, maryo -create mask0600 -guest okYes -printableYes -browseableNo +All Printers +/var/spool/samba +root, maryo +0600 +Yes +Yes +No [print$] -commentPrinter Drivers Share -path/var/lib/samba/drivers -write listmaryo, root -printer adminmaryo, root +Printer Drivers Share +/var/lib/samba/drivers +maryo, root +maryo, root Needed to support domain logons [netlogon] -commentNetwork Logon Service -path/var/lib/samba/netlogon -admin usersroot, maryo -guest okYes -browseableNo +Network Logon Service +/var/lib/samba/netlogon +root, maryo +Yes +No For profiles to work, create a user directory under the path shown. i.e., mkdir -p /var/lib/samba/profiles/maryo [Profiles] -commentRoaming Profile Share -path/var/lib/samba/profiles -read onlyNo -profile aclsYes +Roaming Profile Share +/var/lib/samba/profiles +No +Yes Other resource (share/printer) definitions would follow below. ... @@ -1144,41 +1144,41 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb LDAP backend smb.conf for PDC Global parameters [global] -workgroupMIDEARTH -netbios nameFRODO -passdb backendldapsam:ldap://localhost -username map/etc/samba/smbusers -printcap namecups -add user script/usr/local/sbin/smbldap-useradd.pl -m '%u' -delete user script/usr/local/sbin/smbldap-userdel.pl %u -add group script/usr/local/sbin/smbldap-groupadd.pl -p '%g' -delete group script/usr/local/sbin/smbldap-groupdel.pl '%g' -add user to group script/usr/local/sbin/ \ +MIDEARTH +FRODO +ldapsam:ldap://localhost +/etc/samba/smbusers +cups +/usr/local/sbin/smbldap-useradd.pl -m '%u' +/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' -delete user from group script/usr/local/sbin/ \ +/usr/local/sbin/ \ smbldap-groupmod.pl -x '%g' '%u' -set primary group script/usr/local/sbin/ \ +/usr/local/sbin/ \ smbldap-usermod.pl -g '%g' '%u' -add machine script/usr/local/sbin/smbldap-useradd.pl -w '%u' -logon scriptscripts\logon.bat -logon path\\%L\Profiles\%U -logon driveH: -logon home\\%L\%U -domain logonsYes -os level35 -preferred masterYes -domain masterYes -ldap suffixdc=quenya,dc=org -ldap machine suffixou=People -ldap user suffixou=People -ldap group suffixou=People -ldap idmap suffixou=People -ldap admin dncn=Manager -ldap sslno -ldap passwd syncYes -idmap uid15000-20000 -idmap gid15000-20000 -printingcups +/usr/local/sbin/smbldap-useradd.pl -w '%u' +scripts\logon.bat +\\%L\Profiles\%U +H: +\\%L\%U +Yes +35 +Yes +Yes +dc=quenya,dc=org +ou=People +ou=People +ou=People +ou=People +cn=Manager +no +Yes +15000-20000 +15000-20000 +cups ... @@ -1217,30 +1217,30 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb Remote LDAP BDC smb.conf Global parameters [global] -workgroupMIDEARTH -netbios nameGANDALF -passdb backendldapsam:ldap://frodo.quenya.org -username map/etc/samba/smbusers -printcap namecups -logon scriptscripts\logon.bat -logon path\\%L\Profiles\%U -logon driveH: -logon home\\%L\%U -domain logonsYes -os level33 -preferred masterYes -domain masterNo -ldap suffixdc=quenya,dc=org -ldap machine suffixou=People -ldap user suffixou=People -ldap group suffixou=People -ldap idmap suffixou=People -ldap admin dncn=Manager -ldap sslno -ldap passwd syncYes -idmap uid15000-20000 -idmap gid15000-20000 -printingcups +MIDEARTH +GANDALF +ldapsam:ldap://frodo.quenya.org +/etc/samba/smbusers +cups +scripts\logon.bat +\\%L\Profiles\%U +H: +\\%L\%U +Yes +33 +Yes +No +dc=quenya,dc=org +ou=People +ou=People +ou=People +ou=People +cn=Manager +no +Yes +15000-20000 +15000-20000 +cups ... diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index 4d983655b4..c09d9e860b 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -52,7 +52,7 @@ accounts should be automatically created when these tools are used. In the absence of these scripts, and so long as winbindd is running, Samba group accounts that are created using these tools will be allocated UNIX UIDs/GIDs from the ID range specified by the - idmap uid/idmap gid + / parameters in the &smb.conf; file. @@ -527,7 +527,7 @@ exit 0 Configuration of &smb.conf; for the add group script. [global] ... -add group script/path_to_tool/smbgrpadd.sh "%g" +/path_to_tool/smbgrpadd.sh "%g" ... @@ -591,7 +591,7 @@ manually before putting them into active service. This is a common problem when the groupadd is called directly - by the Samba interface script for the add group script in + by the Samba interface script for the in the &smb.conf; file. diff --git a/docs/Samba-HOWTO-Collection/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml index c5b579a046..f3c589577b 100644 --- a/docs/Samba-HOWTO-Collection/Install.xml +++ b/docs/Samba-HOWTO-Collection/Install.xml @@ -64,14 +64,14 @@ A minimal smb.conf [global] - workgroupWKG - netbios nameMYNAME + WKG + MYNAME [share1] - path/tmp + /tmp [share2] - path/my_shared_folder - commentSome random files + /my_shared_folder + Some random files @@ -151,11 +151,11 @@ Another simple smb.conf File [global] -workgroup&example.workgroup; +&example.workgroup; [homes] -guest okno -read onlyno +no +no diff --git a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml index bfbd1b52da..d979b2baee 100644 --- a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml +++ b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml @@ -577,7 +577,7 @@ to be added to the &smb.conf; file: -wins supportYes +Yes @@ -586,8 +586,8 @@ needed in the &smb.conf; file: -wins supportNo -wins serverxxx.xxx.xxx.xxx +No +xxx.xxx.xxx.xxx diff --git a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml index f255924b23..8082002909 100644 --- a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml +++ b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml @@ -39,8 +39,8 @@ The use of interdomain trusts requires use of winbind. Thus t winbindd daemon must be running. Winbind operation in this mode is dependant on the specification of a valid UID range and a valid GID range in the &smb.conf; file. These are specified respectively using -idmap uid10000-20000 and -idmap gid10000-20000. +10000-20000 and +10000-20000. diff --git a/docs/Samba-HOWTO-Collection/LargeFile.xml b/docs/Samba-HOWTO-Collection/LargeFile.xml index 441094f2fe..f0b73820a2 100644 --- a/docs/Samba-HOWTO-Collection/LargeFile.xml +++ b/docs/Samba-HOWTO-Collection/LargeFile.xml @@ -48,7 +48,7 @@ the directory for names - it knows that if a file does not exist in upper case t -The secret to this is really in the case sensitiveTrue +The secret to this is really in the True line. This tells smbd never to scan for case-insensitive versions of names. So if an application asks for a file called FOO, and it can not be found by a simple stat call, then smbd will return file not found immediately without scanning the containing directory for a version of a different case. The other diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml index f26a1d95af..699c0e8a01 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 root preexec parameters to the NETLOGON share. +the parameters to the NETLOGON share. diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml index 54c4846c66..42da719334 100644 --- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml +++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml @@ -107,26 +107,26 @@ The Samba application that controls browse list management and name resolution i called nmbd. The configuration parameters involved in nmbd's operation are: -Browsing options: os level(*), - lm announce, - lm interval, - preferred master(*), - local master(*), - domain master(*), - browse list, - enhanced browsing. +Browsing options: (*), + , + , + (*), + (*), + (*), + , + . Name Resolution Method: - name resolve order(*). + (*). WINS options: - dns proxy, - wins proxy, - wins server(*), - wins support(*), - wins hook. + , + , + (*), + (*), + . @@ -166,9 +166,9 @@ UDP messages can be broadcast or unicast. UDP Normally, only uni-cast UDP messaging can be forwarded by routers. The -remote announce parameter to smb.conf helps to project browse announcements + parameter to smb.conf helps to project browse announcements to remote network segments via uni-cast UDP. Similarly, the -remote browse sync parameter of &smb.conf; + parameter of &smb.conf; implements browse list collation using uni-cast UDP. @@ -213,16 +213,16 @@ In those networks where Samba is the only SMB server technology, wherever possib server. This makes it easy to manage the browsing environment. If each network segment is configured with its own Samba WINS server, then the only way to get cross-segment browsing to work is by using the -remote announce and the -remote browse sync + and the + parameters to your &smb.conf; file. WINS If only one WINS server is used for an entire multi-segment network, then -the use of the remote announce and the -remote browse sync parameters should not be necessary. +the use of the and the + parameters should not be necessary. @@ -238,7 +238,7 @@ Right now Samba WINS does not support MS-WINS replication. This means that when setting up Samba as a WINS server, there must only be one nmbd configured as a WINS server on the network. Some sites have used multiple Samba WINS servers for redundancy (one server per subnet) and then used -remote browse sync and remote announce + and to effect browse list collation across all segments. Note that this means clients will only resolve local names, and must be configured to use DNS to resolve names on other subnets in order to resolve the IP addresses of the servers they can see @@ -535,7 +535,7 @@ resolution to the local subnet, unless LMHOSTS is used to list all names and IP addresses. In such situations, Samba provides a means by which the Samba server name may be forcibly injected into the browse list of a remote MS Windows network (using the -remote announce parameter). + parameter). @@ -573,13 +573,13 @@ inability to use the network services. Samba supports a feature that allows forced synchronization of browse lists across -routed networks using the remote browse sync +routed networks using the parameter in the &smb.conf; file. This causes Samba to contact the local master browser on a remote network and to request browse list synchronization. This effectively bridges two networks that are separated by routers. The two remote networks may use either broadcast-based name resolution or WINS-based name resolution, but it should be noted that the -remote browse sync parameter provides + parameter provides browse list synchronization &smbmdash; and that is distinct from name to address resolution. In other words, for cross-subnet browsing to function correctly it is essential that a name-to-address resolution mechanism be provided. This mechanism @@ -613,7 +613,7 @@ of the &smb.conf; file: -domain masteryes +yes @@ -628,10 +628,10 @@ file as shown in the following example: Domain Master Browser smb.conf [global] -domain masteryes -local masteryes -preferred masteryes -os level65 +yes +yes +yes +65 @@ -653,10 +653,10 @@ shown in following example: Local master browser smb.conf [global] -domain masterno -local masteryes -preferred masteryes -os level65 +no +yes +yes +65 @@ -666,9 +666,9 @@ each other over which is to be the Local Master Browser. -The local master parameter allows Samba to act as a -Local Master Browser. The preferred master causes nmbd -to force a browser election on startup and the os level +The parameter allows Samba to act as a +Local Master Browser. The causes nmbd +to force a browser election on startup and the parameter sets Samba high enough so it should win any browser elections. @@ -682,10 +682,10 @@ becoming a Local Master Browser by setting the following options in the smb.conf for not being a Master Browser [global] -domain masterno -local masterno -preferred masterno -os level0 +no +no +no +0 @@ -711,16 +711,16 @@ of the &smb.conf; file as shown in following example Local Master Browser smb.conf [global] -domain masterno -local masteryes -preferred masteryes -os level65 +no +yes +yes +65 If you wish to have a Samba server fight the election with machines on the same subnet you -may set the os level parameter to lower levels. +may set the parameter to lower levels. By doing this you can tune the order of machines that will become Local Master Browsers if they are running. For more details on this refer to Forcing Samba to Be the Master section. @@ -736,10 +736,10 @@ and ever becoming a Local Master Browser by setting the following options in the &smb.conf; for not being a master browser [global] -domain masterno -local masterno -preferred masterno -os level0 +no +no +no +0 @@ -755,29 +755,29 @@ elections to just about every Windows network server or client. -If you want Samba to win elections, set the os level +If you want Samba to win elections, set the global option in &smb.conf; to a higher number. It defaults to 20. Using 34 would make it win all elections every other system (except other samba systems). -An os level of two would make it beat Windows for Workgroups and Windows 9x/Me, but not MS Windows +An of two would make it beat Windows for Workgroups and Windows 9x/Me, but not MS Windows NT/200x Server. An MS Windows NT/200x Server Domain Controller uses level 32. The maximum os level is 255. If you want Samba to force an election on startup, set the -preferred master global option in &smb.conf; to yes. + global option in &smb.conf; to yes. Samba will then have a slight advantage over other potential master browsers that are not Preferred Master Browsers. Use this parameter with care, as if you have two hosts (whether they are Windows 9x/Me or -NT/200x/XP or Samba) on the same local subnet both set with preferred master +NT/200x/XP or Samba) on the same local subnet both set with to yes, then periodically and continually they will force an election in order to become the Local Master Browser. If you want Samba to be a Domain Master Browser, then it is recommended that -you also set preferred master to yes, because +you also set to yes, because Samba will not become a Domain Master Browser for the whole of your LAN or WAN if it is not also a Local Master Browser on its own broadcast isolated subnet. @@ -796,7 +796,7 @@ the current Domain Master Browser fail. The domain master is responsible for collating the browse lists of multiple subnets so browsing can occur between subnets. You can -make Samba act as the Domain Master by setting domain masteryes +make Samba act as the Domain Master by setting yes in &smb.conf;. By default it will not be a Domain Master. @@ -815,8 +815,8 @@ other subnets and then contact them to synchronize browse lists. If you want Samba to be the domain master, you should also set the -os level high enough to make sure it wins elections, and -set preferred master to yes, to + high enough to make sure it wins elections, and +set to yes, to get Samba to force an election on startup. @@ -877,22 +877,22 @@ does not seem to support a zeros broadcast and you will probably find that brows Samba supports machines with multiple network interfaces. If you have multiple interfaces, you will -need to use the interfaces option in &smb.conf; to configure them. +need to use the option in &smb.conf; to configure them. Use of the Remote Announce Parameter -The remote announce parameter of +The parameter of &smb.conf; can be used to forcibly ensure that all the NetBIOS names on a network get announced to a remote network. -The syntax of the remote announce parameter is: +The syntax of the parameter is: -remote announcea.b.c.d [e.f.g.h] ... +a.b.c.d [e.f.g.h] ... or -remote announcea.b.c.d/WORKGROUP [e.f.g.h/WORKGROUP] ... +a.b.c.d/WORKGROUP [e.f.g.h/WORKGROUP] ... where: @@ -925,17 +925,17 @@ where: Use of the Remote Browse Sync Parameter -The remote browse sync parameter of +The parameter of &smb.conf; is used to announce to another LMB that it must synchronize its NetBIOS name list with our Samba LMB. This works only if the Samba server that has this option is simultaneously the LMB on its network segment. -The syntax of the remote browse sync parameter is: +The syntax of the parameter is: -remote browse synca.b.c.d +a.b.c.d where a.b.c.d is either the IP address of the @@ -1000,19 +1000,19 @@ errors. To configure Samba as a WINS server just add -wins supportyes to the &smb.conf; +yes to the &smb.conf; file [global] section. To configure Samba to register with a WINS server just add -wins servera.b.c.d +a.b.c.d to your &smb.conf; file [global] section. -Never use both wins supportyes together -with wins servera.b.c.d +Never use both yes together +with a.b.c.d particularly not using its own IP address. Specifying both will cause &nmbd; to refuse to start! @@ -1028,7 +1028,7 @@ the [global] section: -wins supportyes +yes @@ -1040,13 +1040,13 @@ least set the parameter to no on all these machines. -Machines configured with wins supportyes will keep a list of +Machines configured with yes will keep a list of all NetBIOS names registered with them, acting as a DNS for NetBIOS names. It is strongly recommended to set up only one WINS server. Do not set the -wins supportyes option on more than one Samba +yes option on more than one Samba server. @@ -1061,7 +1061,7 @@ participate in these replications. It is possible in the future that a Samba-to-Samba WINS replication protocol may be defined, in which case more than one Samba machine could be set up as a WINS server. Currently only one Samba server should have the -wins supportyes parameter set. +yes parameter set. @@ -1077,7 +1077,7 @@ all &smb.conf; files: -wins server<name or IP address> +<name or IP address> @@ -1089,8 +1089,8 @@ machine or its IP address. This line must not be set in the &smb.conf; file of the Samba server acting as the WINS server itself. If you set both the -wins supportyes option and the -wins server<name> option then +yes option and the +<name> option then nmbd will fail to start. @@ -1244,15 +1244,15 @@ Many sites want to restrict DNS lookups and avoid broadcast name resolution traffic. The name resolve order parameter is of great help here. The syntax of the name resolve order parameter is: -name resolve orderwins lmhosts bcast host +wins lmhosts bcast host or -name resolve orderwins lmhosts (eliminates bcast and host) +wins lmhosts (eliminates bcast and host) The default is: -name resolve orderhost lmhost wins bcast +host lmhost wins bcast where host refers to the native methods used by the UNIX system to implement the gethostbyname() function call. This is normally @@ -1266,7 +1266,7 @@ controlled by /etc/host.conf, /etc/nsswitch.conf< SMB networking provides a mechanism by which clients can access a list -of machines in a network, a so-called browse list. This list +of machines in a network, a so-called . This list contains machines that are ready to offer file and/or print services to other machines within the network. Thus it does not include machines that aren't currently able to do server tasks. The browse @@ -1327,7 +1327,7 @@ recommended that you use one and only one Samba server as the WINS server. To get browsing to work you need to run nmbd as usual, but will need -to use the workgroup option in &smb.conf; +to use the option in &smb.conf; to control what workgroup Samba becomes a part of. @@ -1335,7 +1335,7 @@ to control what workgroup Samba becomes a part of. Samba also has a useful option for a Samba server to offer itself for browsing on another subnet. It is recommended that this option is only used for unusual purposes: announcements over the Internet, for -example. See remote announce in the +example. See in the &smb.conf; man page. @@ -1345,7 +1345,7 @@ example. See remote announce in the If something does not work, the log.nmbd file will help -to track down the problem. Try a log level of 2 or 3 for finding +to track down the problem. Try a of 2 or 3 for finding problems. Also note that the current browse list usually gets stored in text form in a file called browse.dat. @@ -1358,7 +1358,7 @@ press enter and filemanager should display the list of availa Some people find browsing fails because they do not have the global -guest account set to a valid account. Remember that the + set to a valid account. Remember that the IPC$ connection that lists the shares is done as guest and, thus, you must have a valid guest account. @@ -1373,7 +1373,7 @@ server resources. The other big problem people have is that their broadcast address, -netmask or IP address is wrong (specified with the interfaces option +netmask or IP address is wrong (specified with the option in &smb.conf;) @@ -1703,7 +1703,7 @@ guest account for browsing in smbd. Check that your guest acc valid. -Also see guest account in the &smb.conf; man page. +Also see in the &smb.conf; man page. diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml index a53896cd96..17d503b344 100644 --- a/docs/Samba-HOWTO-Collection/Other-Clients.xml +++ b/docs/Samba-HOWTO-Collection/Other-Clients.xml @@ -109,7 +109,7 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) and not copy an installed driver from an OS/2 system. Install the NT driver first for that printer. Then, add to your &smb.conf; a parameter, - os2 driver mapfilename. + filename. Next, in the file specified by filename, map the name of the NT driver name to the OS/2 driver name as follows: @@ -189,7 +189,7 @@ type EXPAND A:\ADMINCFG.EX_ C:\WINDOWS\ADMINCFG.EXE. Then add an icon for it via the Program Manager New Menu. This program allows you to control how WFW handles passwords, i.e., Disable Password Caching and so on. -for use with securityuser. +for use with user. @@ -199,7 +199,7 @@ for use with securityuserWindows for Workgroups uppercases the password before sending it to the server. UNIX passwords can be case-sensitive though. Check the &smb.conf; information on -password level to specify what characters + to specify what characters Samba should try to uppercase when checking. @@ -293,14 +293,14 @@ most likely occur if it is not. In order to serve profiles successfully to Windows 2000 SP2 clients (when not operating as a PDC), Samba must have -nt acl supportno +no added to the file share which houses the roaming profiles. If this is not done, then the Windows 2000 SP2 client will complain about not being able to access the profile (Access Denied) and create multiple copies of it on disk (DOMAIN.user.001, DOMAIN.user.002, and so on). See the &smb.conf; man page for more details on this option. Also note that the -nt acl support parameter was formally a global parameter in + parameter was formally a global parameter in releases prior to Samba 2.2.2. @@ -311,11 +311,11 @@ releases prior to Samba 2.2.2. Minimal profile share [profile] -path/export/profile -create mask0600 -directory mask0700 -nt acl supportno -read onlyno +/export/profile +0600 +0700 +no +no @@ -328,7 +328,7 @@ for the access denied message. -By disabling the nt acl support parameter, Samba will send +By disabling the parameter, Samba will send the Windows 200x client a response to the QuerySecurityDescriptor trans2 call, which causes the client to set a default ACL for the profile. This default ACL includes: diff --git a/docs/Samba-HOWTO-Collection/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml index 239d322ecf..e9983766bc 100644 --- a/docs/Samba-HOWTO-Collection/PAM.xml +++ b/docs/Samba-HOWTO-Collection/PAM.xml @@ -622,7 +622,7 @@ PAM documentation for further helpful information. &smb.conf; PAM Configuration - There is an option in &smb.conf; called obey pam restrictions. + There is an option in &smb.conf; called . The following is from the online help for this option in SWAT; @@ -630,12 +630,12 @@ The following is from the online help for this option in SWAT; When Samba is configured to enable PAM support (i.e., ), this parameter will control whether or not Samba should obey PAM's account and session management directives. The default behavior is to use PAM for clear-text authentication only and to ignore any account or session management. Samba always -ignores PAM for authentication in the case of encrypt passwordsyes. +ignores PAM for authentication in the case of yes. The reason is that PAM modules cannot support the challenge/response authentication mechanism needed in the presence of SMB password encryption. -Default: obey pam restrictionsno +Default: no @@ -666,7 +666,7 @@ lock directory and will be remembered. The astute administrator will realize from this that the combination of pam_smbpass.so, -winbindd and a distributed passdb backend, +winbindd and a distributed , such as ldap, will allow the establishment of a centrally managed, distributed user/password database that can also be used by all PAM-aware (e.g., Linux) programs and applications. This arrangement can have particularly potent advantages compared with the use of Microsoft Active Directory Service (ADS) in so far as @@ -891,8 +891,8 @@ password required /lib/security/pam_stack.so service=system-auth My &smb.conf; file is correctly configured. I have specified - idmap uid12000, - and idmap gid3000-3500 + 12000, + and 3000-3500 and winbind is running. When I do the following it all works fine. diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml index dd2f73585b..2e25646822 100644 --- a/docs/Samba-HOWTO-Collection/PDC.xml +++ b/docs/Samba-HOWTO-Collection/PDC.xml @@ -345,7 +345,7 @@ NT4/200x/XP clients: Configuration of basic TCP/IP and MS Windows networking. - Correct designation of the Server Role (securityuser). + Correct designation of the Server Role (user). Consistent configuration of Name ResolutionSee Network Browsing, and Integrating MS Windows Networks with Samba.. Domain logons for Windows NT4/200x/XP Professional clients. @@ -361,7 +361,7 @@ The following provisions are required to serve MS Windows 9x/Me clients: Configuration of basic TCP/IP and MS Windows networking. - Correct designation of the server role (securityuser). + Correct designation of the server role (user). Network Logon Configuration (since Windows 9x/Me/XP Home are not technically domain members, they do not really participate in the security aspects of Domain logons as such). Roaming Profile Configuration. @@ -404,7 +404,7 @@ A Domain Controller is an SMB/CIFS server that: It is rather easy to configure Samba to provide these. Each Samba Domain Controller must provide -the NETLOGON service that Samba calls the domain logons functionality +the NETLOGON service that Samba calls the functionality (after the name of the parameter in the &smb.conf; file). Additionally, one server in a Samba-3 Domain must advertise itself as the Domain Master BrowserSee Network Browsing.. This causes the Primary Domain Controller to claim a domain-specific NetBIOS name that identifies it as a @@ -429,30 +429,30 @@ in &smb.conf;. An example &smb.conf; for acting as a PDC can be found in smb.conf for being a PDC [global] -netbios nameBELERIAND -workgroup&example.workgroup; -passdb backendtdbsam -os level33 -preferred masteryes -domain masteryes -local masteryes -securityuser -domain logonsyes -logon path\\%N\profiles\%U -logon driveH: -logon home\\homeserver\%U\winprofile -logon scriptlogon.cmd +BELERIAND +&example.workgroup; +tdbsam +33 +yes +yes +yes +user +yes +\\%N\profiles\%U +H: +\\homeserver\%U\winprofile +logon.cmd [netlogon] -path/var/lib/samba/netlogon -read onlyyes -write listntadmin +/var/lib/samba/netlogon +yes +ntadmin [profiles] -path/var/lib/samba/profiles -read onlyno -create mask0600 -directory mask0700 +/var/lib/samba/profiles +no +0600 +0700 @@ -521,11 +521,11 @@ of operation. The following &smb.conf; parameters are the essentials alone: -netbios nameBELERIAND -workgroup&example.workgroup; -domain logonsYes -domain masterYes -securityUser +BELERIAND +&example.workgroup; +Yes +Yes +User @@ -573,8 +573,8 @@ an integral part of the essential functionality that is provided by a Domain Con All Domain Controllers must run the netlogon service (domain logons -in Samba). One Domain Controller must be configured with domain masterYes -(the Primary Domain Controller); on all Backup Domain Controllers domain masterNo +in Samba). One Domain Controller must be configured with Yes +(the Primary Domain Controller); on all Backup Domain Controllers No must be set. @@ -584,14 +584,14 @@ must be set. smb.conf for being a PDC [global] -domain logonsYes -domain master(Yes on PDC, No on BDCs) +Yes +(Yes on PDC, No on BDCs) [netlogon] -commentNetwork Logon Service -path/var/lib/samba/netlogon -guest okYes -browseableNo +Network Logon Service +/var/lib/samba/netlogon +Yes +No @@ -791,11 +791,11 @@ For this reason, it is wise to configure the Samba DC as the DMB. Now back to the issue of configuring a Samba DC to use a mode other than -securityuser. If a Samba host is +user. If a Samba host is configured to use another SMB server or DC in order to validate user connection requests, -it is a fact that some other machine on the network (the password server) +it is a fact that some other machine on the network (the ) knows more about the user than the Samba host. About 99% of the time, this other host is -a Domain Controller. Now to operate in domain mode security, the workgroup +a Domain Controller. Now to operate in domain mode security, the parameter must be set to the name of the Windows NT domain (which already has a Domain Controller). If the domain does not already have a Domain Controller, you do not yet have a Domain. @@ -803,7 +803,7 @@ If the domain does not already have a Domain Controller, you do not yet have a D Configuring a Samba box as a DC for a domain that already by definition has a PDC is asking for trouble. Therefore, you should always configure the Samba DC -to be the DMB for its domain and set securityuser. +to be the DMB for its domain and set user. This is the only officially supported mode of operation. @@ -909,7 +909,7 @@ wrong? This problem is caused by the PDC not having a suitable Machine Trust Account. -If you are using the add machine script method to create +If you are using the method to create accounts then this would indicate that it has not worked. Ensure the domain admin user system is working. diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml index adfec20df5..07afbae0be 100644 --- a/docs/Samba-HOWTO-Collection/Passdb.xml +++ b/docs/Samba-HOWTO-Collection/Passdb.xml @@ -225,9 +225,9 @@ Samba-3 introduces a number of new password backend capabilities. In addition to differently encrypted passwords, Windows also stores certain data for each user that is not stored in a UNIX user database. For example, workstations the user may logon from, the location where the user's profile is stored, and so on. Samba retrieves and stores this - information using a passdb backend. Commonly available backends are LDAP, plain text + information using a . Commonly available backends are LDAP, plain text file, and MySQL. For more information, see the man page for &smb.conf; regarding the - passdb backend parameter. + parameter. @@ -376,7 +376,7 @@ Samba-3 introduces a number of new password backend capabilities. First, all Samba SAM (Security Account Manager database) accounts require a UNIX/Linux UID that the account will map to. As users are added to the account - information database, Samba will call the add user script + information database, Samba will call the interface to add the account to the Samba host OS. In essence all accounts in the local SAM require a local user account. @@ -418,9 +418,9 @@ Samba-3 introduces a number of new password backend capabilities. Example configuration with the LDAP idmap backend SAM backendxmlsam [global] -idmap backendldap:ldap://ldap-server.quenya.org:636 +ldap:ldap://ldap-server.quenya.org:636 Alternately, this could be specified as: -idmap backendldap:ldaps://ldap-server.quenya.org +ldap:ldaps://ldap-server.quenya.org @@ -620,7 +620,7 @@ Password must change: Mon, 18 Jan 2038 20:14:07 GMT - Set the passdb backendtdbsam, smbpasswd. + Set the tdbsam, smbpasswd. @@ -655,7 +655,7 @@ backends of the same type. For example, to use two different tdbsam databases: - passdb backendtdbsam:/etc/samba/passdb.tdb \ + tdbsam:/etc/samba/passdb.tdb \ tdbsam:/etc/samba/old-passdb.tdb @@ -680,7 +680,7 @@ backends of the same type. For example, to use two different tdbsam databases: SAM backendsmbpasswd - Traditionally, when configuring encrypt passwordsyes in Samba's &smb.conf; file, user account + Traditionally, when configuring yes in Samba's &smb.conf; file, user account information such as username, LM/NT password hashes, password change times, and account flags have been stored in the smbpasswd(5) file. There are several disadvantages to this approach for sites with large numbers of users (counted @@ -1075,17 +1075,17 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz LDAP related smb.conf options: - passdb backendldapsam:url, - ldap admin dn, - ldap delete dn, - ldap filter, - ldap group suffix, - ldap idmap suffix, - ldap machine suffix, - ldap passwd sync, - ldap ssl, - ldap suffix, - ldap user suffix, + ldapsam:url, + , + , + , + , + , + , + , + , + , + , @@ -1098,10 +1098,10 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz Configuration with LDAP [global] -securityuser -encrypt passwordsyes -netbios nameMORIA -workgroupNOLDOR +user +yes +MORIA +NOLDOR ldap related parameters @@ -1110,32 +1110,32 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz must be set by using 'smbpasswd -w secretpw' to store the passphrase in the secrets.tdb file. If the "ldap admin dn" values change, this password will need to be reset. -ldap admin dn"cn=Manager,dc=quenya,dc=org" +"cn=Manager,dc=quenya,dc=org" Define the SSL option when connecting to the directory ('off', 'start tls', or 'on' (default)) -ldap sslstart tls +start tls syntax: passdb backend = ldapsam:ldap://server-name[:port] -passdb backendldapsam:ldap://frodo.quenya.org +ldapsam:ldap://frodo.quenya.org smbpasswd -x delete the entire dn-entry -ldap delete dnno +no the machine and user suffix added to the base suffix wrote WITHOUT quotes. NULL suffixes by default -ldap user suffixou=People -ldap group suffixou=Groups -ldap machine suffixou=Computers +ou=People +ou=Groups +ou=Computers Trust UNIX account information in LDAP (see the smb.conf man page for details) specify the base DN to use when searching the directory -ldap suffixdc=quenya,dc=org +dc=quenya,dc=org generally the default ldap search filter is ok -ldap filter(uid=%u) +(uid=%u) @@ -1197,13 +1197,13 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz - To remedy the first security issue, the ldap ssl &smb.conf; parameter defaults - to require an encrypted session (ldap sslon) using + To remedy the first security issue, the &smb.conf; parameter defaults + to require an encrypted session (on) using the default port of 636 when contacting the directory server. When using an OpenLDAP server, it is possible to use the StartTLS LDAP extended operation in the place of LDAPS. In either case, you are strongly discouraged to disable this security - (ldap ssloff). + (off). @@ -1279,12 +1279,12 @@ access to attrs=SambaLMPassword,SambaNTPassword sambaLogonScriptThe sambaLogonScript property specifies the path of the user's logon script, .CMD, .EXE, or .BAT file. The string can be null. The path - is relative to the netlogon share. Refer to the logon script parameter in the + is relative to the netlogon share. Refer to the parameter in the &smb.conf; man page for more information. sambaProfilePathSpecifies a path to the user's profile. This value can be a null string, a local absolute path, or a UNC path. Refer to the - logon path parameter in the &smb.conf; man page for more information. + parameter in the &smb.conf; man page for more information. sambaHomePathThe sambaHomePath property specifies the path of the home directory for the user. The string can be null. If sambaHomeDrive is set and specifies @@ -1336,12 +1336,12 @@ access to attrs=SambaLMPassword,SambaNTPassword These attributes are only stored with the sambaSamAccount entry if the values are non-default values. For example, assume MORIA has now been - configured as a PDC and that logon home\\%L\%u was defined in + configured as a PDC and that \\%L\%u was defined in its &smb.conf; file. When a user named becky logons to the domain, - the logon home string is expanded to \\MORIA\becky. + the string is expanded to \\MORIA\becky. If the smbHome attribute exists in the entry uid=becky,ou=People,dc=samba,dc=org, this value is used. However, if this attribute does not exist, then the value - of the logon home parameter is used in its place. Samba + of the parameter is used in its place. Samba will only write the attribute value to the directory entry if the value is something other than the default (e.g., \\MOBY\becky). @@ -1420,7 +1420,7 @@ access to attrs=SambaLMPassword,SambaNTPassword using pam_ldap, this allows changing both UNIX and Windows passwords at once. - The ldap passwd sync options can have the values shown in + The options can have the values shown in the next table. @@ -1484,15 +1484,15 @@ access to attrs=SambaLMPassword,SambaNTPassword ConfiguringThis plug-in lacks some good documentation, but here is some brief information. Add the following to the - passdb backend variable in your &smb.conf;: + variable in your &smb.conf;: -passdb backend[other-plugins] mysql:identifier [other-plugins] +[other-plugins] mysql:identifier [other-plugins] The identifier can be any string you like, as long as it does not collide with the identifiers of other plugins or other instances of pdb_mysql. If you - specify multiple pdb_mysql.so entries in passdb backend, you also need to + specify multiple pdb_mysql.so entries in , you also need to use different identifiers. @@ -1552,7 +1552,7 @@ access to attrs=SambaLMPassword,SambaNTPassword domain columnvarchar(255)NT domain user belongs tont username columnvarchar(255)NT usernamefullname columnvarchar(255)Full name of user - home dir columnvarchar(255)UNIX homedir path (equivalent of the logon home parameter. + home dir columnvarchar(255)UNIX homedir path (equivalent of the parameter.dir drive columnvarchar(2)Directory drive path (e.g., H:)logon script columnvarchar(255)Batch file to run on client side when logging onprofile path columnvarchar(255)Path of profile @@ -1587,19 +1587,19 @@ access to attrs=SambaLMPassword,SambaNTPassword Example configuration for the MySQL passdb backend [global] - passdb backendmysql:foo - foo:mysql usersamba - foo:mysql passwordabmas - foo:mysql databasesamba + mysql:foo + samba + abmas + samba domain name is static and can't be changed - foo:domain column'MYWORKGROUP': + 'MYWORKGROUP': The fullname column comes from several other columns - foo:fullname columnCONCAT(firstname,' ',surname): + CONCAT(firstname,' ',surname): Samba should never write to the password columns - foo:lanman pass columnlm_pass: - foo:nt pass columnnt_pass: + lm_pass: + nt_pass: The unknown 3 column is not stored - foo:unknown 3 columnNULL + NULL @@ -1680,7 +1680,7 @@ access to attrs=SambaLMPassword,SambaNTPassword I've installed Samba, but now I can't log on with my UNIX account! - Make sure your user has been added to the current Samba passdb backend. + Make sure your user has been added to the current Samba . Read the section Account Management Tools for details. @@ -1698,7 +1698,7 @@ access to attrs=SambaLMPassword,SambaNTPassword [global] ... - passdb backendsmbpasswd, tdbsam + smbpasswd, tdbsam ... @@ -1712,7 +1712,7 @@ access to attrs=SambaLMPassword,SambaNTPassword [globals] ... -passdb backendtdbsam, smbpasswd +tdbsam, smbpasswd ... @@ -1723,9 +1723,9 @@ access to attrs=SambaLMPassword,SambaNTPassword Configuration of <parameter>auth methods</parameter> - When explicitly setting an auth methods parameter, + When explicitly setting an parameter, guest must be specified as the first entry on the line, - for example, auth methodsguest sam. + for example, guest sam. diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml index b02bab0d52..7a71168b49 100644 --- a/docs/Samba-HOWTO-Collection/Printing.xml +++ b/docs/Samba-HOWTO-Collection/Printing.xml @@ -190,14 +190,14 @@ However, in many environments these are enough to provide a valid Simple configuration with BSD printing [global] -printingbsd -load printersyes +bsd +yes [printers] -path/var/spool/samba -printableyes -publicyes -writableno +/var/spool/samba +yes +yes +no @@ -215,8 +215,8 @@ so you may want to pipe it through a pager program. The syntax for the configuration file is easy to grasp. You should know that is not very picky about its syntax. As has been explained elsewhere in this document, Samba tolerates some spelling errors (such -as browseable instead of -browseable), and spelling is +as instead of +), and spelling is case-insensitive. It is permissible to use Yes/No or True/False for Boolean settings. Lists of names may be separated by commas, spaces or tabs. @@ -294,7 +294,7 @@ configuration used, add the -v parameter to testparm.testparm shows the parameters you expect. To give you a warning from personal experience, -try to just comment out the load printers +try to just comment out the parameter. If your 2.2.x system behaves like mine, you'll see this: @@ -327,7 +327,7 @@ the reason. But I am no longer fooled ... at least not by this. Only when the parameter is explicitly set to -load printersNo +No would Samba conform with my intentions. So, my strong advice is: @@ -417,7 +417,7 @@ This means that a line consisting of, for example: This defines LPRng as the printing system -printing lprng + lprng @@ -449,35 +449,35 @@ file to remove all parameters that are set at default. Extended BSD Printing Configuration [global] -printingbsd -load printersyes -show add printer wizardyes -printcap name/etc/printcap -printer admin@ntadmin, root -max print jobs100 -lpq cache time20 -use client driverno +bsd +yes +yes +/etc/printcap +@ntadmin, root +100 +20 +no [printers] -commentAll Printers -printableyes -path/var/spool/samba -browseableno -guest okyes -publicyes -read onlyyes -writableno +All Printers +yes +/var/spool/samba +no +yes +yes +yes +no [my_printer_name] -commentPrinter with Restricted Access -path/var/spool/samba_my_printer -printer adminkurt -browseableyes -printableyes -writableno -hosts allow0.0.0.0 -hosts denyturbo_xp, 10.160.50.23, 10.160.51.60 -guest okno +Printer with Restricted Access +/var/spool/samba_my_printer +kurt +yes +yes +no +0.0.0.0 +turbo_xp, 10.160.50.23, 10.160.51.60 +no @@ -513,23 +513,23 @@ share settings and specify other values). - printingbsd + bsd Causes Samba to use default print commands applicable for the BSD (also known as RFC 1179 style or LPR/LPD) printing system. In general, the printing parameter informs Samba about the print subsystem it should expect. Samba supports CUPS, LPD, LPRNG, SYSV, HPUX, AIX, QNX, and PLP. Each of these systems defaults to a - different print command (and other queue control + different (and other queue control commands). - The printing parameter is + The parameter is normally a service level parameter. Since it is included here in the [global] section, it will take effect for all printer shares that are not defined differently. Samba-3 no longer supports the SOFTQ printing system. - load printersyes + yes Tells Samba to create automatically all available printer shares. Available printer shares are discovered by scanning the printcap file. All created printer shares are also loaded @@ -542,7 +542,7 @@ share settings and specify other values). publicly visible and available). - show add printer wizardyes + yes Setting is normally enabled by default (even if the parameter is not specified in &smb.conf;). It causes the Add Printer Wizard icon to appear in the Printers folder of the Samba host's @@ -556,7 +556,7 @@ share settings and specify other values). uploaded driver. - max print jobs100 + 100 Sets the upper limit to 100 print jobs being active on the Samba server at any one time. Should a client submit a job that exceeds this number, a no more space @@ -565,31 +565,31 @@ share settings and specify other values). no limit at all. - printcap name/etc/printcap + /etc/printcap Tells Samba where to look for a list of available printer names. Where CUPS is used, make sure that a printcap file is written. This is controlled by the Printcap directive in the cupsd.conf file. - printer admin@ntadmin + @ntadmin Members of the ntadmin group should be able to add drivers and set printer properties (ntadmin is only an example name, it needs to be a valid UNIX group name); root is implicitly always a - printer admin. The @ sign precedes group names in the + . The @ sign precedes group names in the /etc/group. A printer admin can do anything to printers via the remote administration interfaces offered by MS-RPC - (see below). In larger installations, the printer admin + (see below). In larger installations, the parameter is normally a per-share parameter. This permits different groups to administer each printer share. - lpq cache time20 + 20 Controls the cache time for the results of the lpq command. It prevents the lpq command being called too often and reduces the load on a heavily used print server. - use client driverno + no If set to yes, only takes effect for Windows NT/200x/XP clients (and not for Win 95/98/ME). Its default value is No (or False). @@ -617,26 +617,26 @@ man page.) Settings inside this container must be Share Level parameters. - commentAll printers + All printers - The comment is shown next to the share if + The is shown next to the share if a client queries the server, either via Network Neighborhood or with the net view command to list available shares. - printableyes + yes The [printers] 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 path + into the directory specified with the parameter for this service. It is used by Samba to differentiate printer shares from file shares. - path/var/spool/samba + /var/spool/samba Must point to a directory used by Samba to spool incoming print files. It must not be the same as the spool directory specified in the configuration of your UNIX @@ -645,21 +645,21 @@ man page.) Settings inside this container must be Share Level parameters. - browseableno + no Is always set to no if - printableyes. It makes + yes. It makes the [printer] 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). - guest okyes + yes If this parameter is set to yes, no password is required to connect to the printer's service. Access will be granted with the privileges of the - guest account. On many systems the guest + . On many systems the guest account will map to a user named nobody. This user will usually be found in the UNIX passwd file with an empty password, but with no valid UNIX login. (On some systems the guest account might not have the privilege to be able to print. Test this @@ -672,10 +672,10 @@ man page.) Settings inside this container must be Share Level parameters. - publicyes + yes - Is a synonym for guest okyes. - Since we have guest okyes, it + Is a synonym for yes. + Since we have yes, it really does not need to be here. (This leads to the interesting question: What if I by accident have two contradictory settings for the same share? The answer is the last one encountered by Samba wins. Testparm does not complain about different settings @@ -685,7 +685,7 @@ man page.) Settings inside this container must be Share Level parameters. - read onlyyes + yes Normally (for other types of shares) prevents users from creating or modifying files in the service's directory. However, in a printable service, it is @@ -694,9 +694,9 @@ man page.) Settings inside this container must be Share Level parameters. - writableno + no - Is a synonym for read onlyyes. + Is a synonym for yes. @@ -707,7 +707,7 @@ man page.) Settings inside this container must be Share Level parameters. If a section appears in the &smb.conf; file, which when given the parameter -printableyes causes Samba to configure it +yes causes Samba to configure it as a printer share. Windows 9x/Me clients may have problems with connecting or loading printer drivers if the share name has more than eight characters. Do not name a printer share with a name that may conflict with an existing user or file share name. On Client connection requests, Samba always tries to find file @@ -716,20 +716,20 @@ to a printer with the same name! - commentPrinter with Restricted Access + Printer with Restricted Access The comment says it all. - path/var/spool/samba_my_printer + /var/spool/samba_my_printer Sets the spooling area for this printer to a directory other than the default. It is not necessary to set it differently, but the option is available. - printer adminkurt + kurt The printer admin definition is different for this explicitly defined printer share from the general [printers] share. It is not a requirement; we @@ -737,42 +737,42 @@ to a printer with the same name! - browseableyes + yes This makes the printer browseable so the clients may conveniently find it when browsing the Network Neighborhood. - printableyes + yes See The [printers] Section. - writableno + no See The [printers] Section. - hosts allow10.160.50.,10.160.51. + 10.160.50.,10.160.51. - Here we exercise a certain degree of access control by using the hosts allow and hosts deny + Here we exercise a certain degree of access control by using the and parameters. This is not by any means a safe bet. It is not a way to secure your printers. This line accepts all clients from a certain subnet in a first evaluation of access control. - hosts denyturbo_xp,10.160.50.23,10.160.51.60 + turbo_xp,10.160.50.23,10.160.51.60 All listed hosts are not allowed here (even if they belong to the allowed subnets). As you can see, you could name IP addresses as well as NetBIOS hostnames here. - guest okno + no This printer is not open for the guest account. @@ -787,7 +787,7 @@ to a printer with the same name! In each section defining a printer (or in the [printers] 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 path parameter). Typically, +if you remember, set up with the parameter). Typically, this command will submit the spool file to the Samba host's print subsystem, using the suitable system print command. But there is no requirement that this needs to be the case. For debugging or some other reason, you may want to do something completely different than print the file. An example is a @@ -804,8 +804,8 @@ your hard disk may soon suffer from shortage of free space. You learned earlier on that Samba, in most cases, uses its built-in settings for many parameters if it cannot find an explicitly stated one in its configuration file. The same is true for the -print command. The default print command varies depending -on the printing parameter setting. In the commands listed +. The default print command varies depending +on the parameter setting. In the commands listed below, you will notice some parameters of the form %X where X is p, s, J, and so on. These letters stand for printer name, spool-file and job ID, respectively. They are explained in more detail further below. Next table presents an overview of key @@ -825,63 +825,63 @@ printing options but excludes the special case of CUPS that is discussed in - printingbsd|aix|lprng|plp + bsd|aix|lprng|plp print command is lpr -r -P%p %s - printingsysv|hpux + sysv|hpux print command is lp -c -P%p %s; rm %s - printingqnx + qnx print command is lp -r -P%p -s %s - printingbsd|aix|lprng|plp + bsd|aix|lprng|plp lpq command is lpq -P%p - printingsysv|hpux + sysv|hpux lpq command is lpstat -o%p - printingqnx + qnx lpq command is lpq -P%p - printingbsd|aix|lprng|plp + bsd|aix|lprng|plp lprm command is lprm -P%p %j - printingsysv|hpux + sysv|hpux lprm command is cancel %p-%j - printingqnx + qnx lprm command is cancel %p-%j - printingbsd|aix|lprng|plp + bsd|aix|lprng|plp lppause command is lp -i %p-%j -H hold - printingsysv|hpux + sysv|hpux lppause command (...is empty) - printingqnx + qnx lppause command (...is empty) - printingbsd|aix|lprng|plp + bsd|aix|lprng|plp lpresume command is lp -i %p-%j -H resume - printingsysv|hpux + sysv|hpux lpresume command (...is empty) - printingqnx + qnx lpresume command (...is empty) @@ -891,7 +891,7 @@ printing options but excludes the special case of CUPS that is discussed in We excluded the special case of CUPS here, because it is discussed in the next chapter. For printing = CUPS, if Samba is compiled against libcups, it uses the CUPS API to submit -jobs. (It is a good idea also to set printcapcups +jobs. (It is a good idea also to set cups in case your cupsd.conf is set to write its auto-generated printcap file to an unusual place). Otherwise, Samba maps to the System V printing commands with the -oraw option for printing, i.e., it uses lp -c -d%p -oraw; rm %s. With printing = cups, @@ -904,7 +904,7 @@ and if Samba is compiled against libcups, any manually set print command will be Custom Print Commands -After a print job has finished spooling to a service, the print command +After a print job has finished spooling to a service, the will be used by Samba via a system() call to process the spool file. Usually the command specified will submit the spool file to the host's printing subsystem. But there is no requirement at all that this must be the case. The print subsystem may not remove the spool @@ -957,25 +957,25 @@ You can form quite complex print commands. You need to realize that print comman passed to a UNIX shell. The shell is able to expand the included environment variables as usual. (The syntax to include a UNIX environment variable $variable in the Samba print command is %$variable.) To give you a working -print command example, the following will log a print job + example, the following will log a print job to /tmp/print.log, print the file, then remove it. The semicolon (; is the usual separator for commands in shell scripts: -print commandecho Printing %s >> \ +echo Printing %s >> \ /tmp/print.log; lpr -P %p %s; rm %s You may have to vary your own command considerably from this example depending on how you normally print -files on your system. The default for the print command -parameter varies depending on the setting of the printing +files on your system. The default for the +parameter varies depending on the setting of the parameter. Another example is: -print command/usr/local/samba/bin/myprintscript %p %s +/usr/local/samba/bin/myprintscript %p %s @@ -1138,7 +1138,7 @@ 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 -as path are arbitrary and should be replaced with appropriate values for your +as are arbitrary and should be replaced with appropriate values for your site). See next example. @@ -1148,23 +1148,23 @@ site). See next example. [global] members of the ntadmin group should be able to add drivers and set printer properties. root is implicitly always a 'printer admin'. -printer admin@ntadmin +@ntadmin ... [printers] ... [print$] -commentPrinter Driver Download Area -path/etc/samba/drivers -browseableyes -guest okyes -read onlyyes -write list@ntadmin, root +Printer Driver Download Area +/etc/samba/drivers +yes +yes +yes +@ntadmin, root Of course, you also need to ensure that the directory named by the -path parameter exists on the UNIX file system. + parameter exists on the UNIX file system. @@ -1179,7 +1179,7 @@ The following parameters are frequently needed in this share section: - commentPrinter Driver Download Area + Printer Driver Download Area The comment appears next to the share name if it is listed in a share list (usually Windows clients will not see it, but it will also appear up in a smbclient -L sambaserver @@ -1187,13 +1187,13 @@ The following parameters are frequently needed in this share section: - path/etc/samba/printers + /etc/samba/printers Is the path to the location of the Windows driver file deposit from the UNIX point of view. - browseableno + no Makes the [print$] share invisible to clients from the Network Neighborhood. However, you can still mount it from any client @@ -1202,7 +1202,7 @@ The following parameters are frequently needed in this share section: - guest okyes + yes Gives read-only access to this share for all guest users. Access may be granted to download and install printer drivers on clients. The requirement for guest ok @@ -1223,14 +1223,14 @@ The following parameters are frequently needed in this share section: - read onlyyes + yes Because we do not want everybody to upload driver files (or even change driver settings), we tagged this share as not writable. - write list@ntadmin, root + @ntadmin, root The [print$] was made read-only by the previous setting so we should create a write list entry also. UNIX @@ -1239,7 +1239,7 @@ The following parameters are frequently needed in this share section: update files on the share. Normally, you will want to only name administrative-level user account in this setting. Check the file system permissions to make sure these accounts can copy files to the share. If this is a non-root account, then the account should also - be mentioned in the global printer admin + be mentioned in the global parameter. See the &smb.conf; man page for more information on configuring file shares. @@ -1253,7 +1253,7 @@ 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$] -service (i.e., the UNIX directory named by the path +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 must be exactly the names listed below (you may leave out the subdirectories of architectures you do @@ -1381,7 +1381,7 @@ to a printer is open to us. You now have the choice of: Once the APW is started, the procedure is exactly the same as the one you are familiar with in Windows (we assume here that you are familiar with the printer driver installations procedure on Windows NT). Make sure -your connection is, in fact, setup as a user with printer admin +your connection is, in fact, setup as a user with privileges (if in doubt, use smbstatus to check for this). If you wish to install printer drivers for client operating systems other than Windows NT x86, you will need to use the Sharing tab of the printer properties dialog. @@ -1389,7 +1389,7 @@ you will need to use the Sharing tab of the printer propert Assuming you have connected with an administrative (or root) account (as named by the -printer admin parameter), you will also be able to modify + parameter), you will also be able to modify other printer properties such as ACLs and default device settings using this dialog. For the default device settings, please consider the advice given further in Installing Print Drivers Using rpcclient. @@ -1963,7 +1963,7 @@ user nobody. In a DOS box type: net use \\SAMBA-SERVER\print$ /user:root -Replace root, if needed, by another valid printer admin user as given in +Replace root, if needed, by another valid user as given in the definition. Should you already be connected as a different user, you will get an error message. There is no easy way to get rid of that connection, because Windows does not seem to know a concept of logging off from a share connection (do not confuse this with logging off from the local workstation; that is @@ -2056,7 +2056,7 @@ in the following paragraphs. Be aware that a valid Device Mode can only be initiated by a -printer admin, or root +, or root (the reason should be obvious). Device Modes can only be correctly 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, @@ -2172,7 +2172,7 @@ command... field from the Start menu. After you installed the driver on the Samba server (in its [print$] 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 printer admin. This is to make sure that: +habit for yourself to build the very first connection from a client as . This is to make sure that: @@ -2207,7 +2207,7 @@ To connect as root to a Samba printer, try this command from a Windows 200x/XP D You will be prompted for root's Samba-password; type it, wait a few seconds, click on Printing Defaults, and proceed to set the job options that should be used as defaults by all -clients. Alternately, instead of root you can name one other member of the printer admin from the setting. +clients. Alternately, instead of root you can name one other member of the from the setting. @@ -2315,7 +2315,7 @@ The following list needs periods after the letters and numbers::::::::: Do you see any difference in the two settings dialogs? I do not either. However, only the last one, which you arrived at with steps C.1 through 6 will permanently save any settings which will then become the defaults for new users. If you want all clients to have the same defaults, you need to conduct these steps as -administrator (printer admin in ) before +administrator ( in ) before a client downloads the driver (the clients can later set their own per-user defaults by following procedures A or B above). Windows 200x/XP allow per-user default settings and the ones the administrator gives them, before they set up their own. The parents of the identically-looking dialogs have a slight difference in their window names; one is called Default Print @@ -2457,7 +2457,7 @@ folder. Also located in this folder is the Windows NT Add Printer Wizard icon. T The connected user is able to successfully execute an OpenPrinterEx(\\server) with - administrative privileges (i.e., root or printer admin). + administrative privileges (i.e., root or ). Try this from a Windows 200x/XP DOS box command prompt: @@ -2472,7 +2472,7 @@ folder. Also located in this folder is the Windows NT Add Printer Wizard icon. T ... contains the setting - show add printer wizardyes (the + yes (the default). @@ -2495,25 +2495,25 @@ The APW can do various things: Add an entirely new printer to the Samba host (only in conjunction with a working - add printer command. A corresponding - delete printer command for removing entries from the + . A corresponding + for removing entries from the Printers folder may also be provided). The last one (add a new printer) requires more effort than the previous ones. To use -the APW to successfully add a printer to a Samba server, the add printer command must have a defined value. The program hook must successfully +the APW to successfully add a printer to a Samba server, the must have a defined value. The program hook must successfully add the printer to the UNIX print system (i.e., to /etc/printcap, /etc/cups/printers.conf or other appropriate files) and to &smb.conf; if necessary. When using the APW from a client, if the named printer share does not exist, smbd will execute the -add printer command and re-parse to the to attempt to locate the new printer + and re-parse to the to attempt to locate the new printer share. If the share is still not defined, an error of Access Denied is returned to -the client. The add printer command is executed -under the context of the connected user, not necessarily a root account. A map to guestbad user may have connected you unwittingly under the wrong +the client. The is executed +under the context of the connected user, not necessarily a root account. A bad user may have connected you unwittingly under the wrong privilege. You should check it by using the smbstatus command. @@ -2735,7 +2735,7 @@ Pooling assigns a logical printer to multiple ports as a form of load balancing If you require multiple ports be defined for some reason or another (my users and my boss should not know -that they are working with Samba), configure enumports command +that they are working with Samba), configure which can be used to define an external program that generates a listing of ports on a system. diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml index e6507bf3e1..c7b8f9df90 100644 --- a/docs/Samba-HOWTO-Collection/Problems.xml +++ b/docs/Samba-HOWTO-Collection/Problems.xml @@ -34,7 +34,7 @@ on the screen. One of the best diagnostic tools for debugging problems is Samba itself. You can use the for both &smbd; and &nmbd; to specify the -debug level at which to run. + at which to run. See the man pages for smbd, nmbd and &smb.conf; for more information regarding debugging options. The debug level can range from 1 (the default) to 10 (100 for debugging passwords). diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml index 6ac8e7c295..9bd0db83f4 100644 --- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml +++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml @@ -75,14 +75,14 @@ For example, to support Windows NT4/200x clients, set the following in the [glob -logon path + \\profileserver\profileshare\profilepath\%U\moreprofilepath This is typically implemented like: -logon path\\%L\Profiles\%u +\\%L\Profiles\%u where %L translates to the name of the Samba server and %u translates to the user name. @@ -107,7 +107,7 @@ to not use the homes meta-service name as part Windows 9x/Me User Profiles -To support Windows 9x/Me clients, you must use the logon home +To support Windows 9x/Me clients, you must use the parameter. Samba has been fixed so net use /home now works as well and it, too, relies on the logon home parameter. @@ -118,7 +118,7 @@ directory. But wait! There is a trick you can use. If you set the following in [global] section of your &smb.conf; file: -logon home\\%L\%U\.profiles +\\%L\%U\.profiles @@ -130,7 +130,7 @@ of your home directory called .profiles (making them hidden Not only that, but net use /home will also work because of a feature in Windows 9x/Me. It removes any directory stuff off the end of the home directory area and only uses the server and share portion. That is, it looks like you -specified \\%L\%U for logon home. +specified \\%L\%U for . @@ -139,12 +139,12 @@ specified \\%L\%U for logon home You can support profiles for Windows 9x and Windows NT clients by setting both the -logon home and logon path parameters. For example: + and parameters. For example: -logon home\\%L\%u\.profiles -logon path\\%L\profiles\%u +\\%L\%u\.profiles +\\%L\profiles\%u @@ -168,7 +168,7 @@ There are three ways of doing this: In &smb.conf; Affect the following settings and ALL clients will be forced to use a local profile: - logon home and logon path + and @@ -230,9 +230,9 @@ When a user first logs in on Windows 9X, the file user.DAT is created, as are fo 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 -preserve caseyes, -short preserve caseyes and -case sensitiveno +yes, +yes and +no in order to maintain capital letters in shortcuts in any of the profile folders. @@ -275,7 +275,7 @@ if that domain logon server supports it), user name and user's password. wish to save the user's preferences? Select Yes. Once the Windows 9x/Me client comes up with the desktop, you should be able to examine the -contents of the directory specified in the logon path on +contents of the directory specified in the on the Samba server and verify that the Desktop, Start Menu, Programs and Nethood folders have been created. @@ -329,7 +329,7 @@ shown below. When this user next logs in, the user will be told that he/she is l - Check the contents of the profile path (see logon path + Check the contents of the profile path (see described above) and delete the user.DAT or user.MAN file for the user, making a backup if required. @@ -364,12 +364,12 @@ provided with Windows NT4/200x server, and see what the differences are with the Windows NT4 Workstation When a user first logs in to a Windows NT Workstation, the profile NTuser.DAT is created. The profile -location can be now specified through the logon path parameter. +location can be now specified through the parameter. - There is a parameter that is now available for use with NT Profiles: logon drive. + There is a parameter that is now available for use with NT Profiles: . This should be set to H: or any other drive, and should be used in conjunction with -the new logon home parameter. +the new parameter. The entry for the NT4 profile is a directory not a file. The NT help on Profiles mentions that a directory is also created with a .PDS extension. The user, while logging in, must have write permission @@ -513,8 +513,8 @@ user logs on again with the newer version of MS Windows. If you then want to share the same Start Menu/Desktop with W9x/Me, you will need to specify a common location for the profiles. The &smb.conf; parameters that need to be common are -logon path and -logon home. + and +. If you have this set up correctly, you will find separate user.DAT and NTuser.DAT files in the same profile directory. @@ -1094,9 +1094,9 @@ First, the Samba server needs to be configured as a Domain Controller. This can setting in &smb.conf;: -securityuser -os level32 (or more) -domain logonsYes +user +32 (or more) +Yes There must be a [netlogon] share that is world readable. It is @@ -1115,9 +1115,9 @@ so they do not interoperate with domain profiles. For roaming profiles, add to &smb.conf;: -logon path\\%N\profiles\%U +\\%N\profiles\%U Default logon drive is Z: -logon driveH: +H: This requires a PROFILES share that is world writable. diff --git a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml index 0d16314cd3..83d4ed1896 100644 --- a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml +++ b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml @@ -61,7 +61,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, enable privilegesyes +this feature, yes must be defined in the global section of the &smb.conf; file. @@ -227,7 +227,7 @@ on the Samba mailing lists. SePrintOperatorPrivilege This privilege operates identically to the - printer admin + option in the &smb.conf; file (see section 5 man page for &smb.conf;) except that it is a global right (not on a per printer basis). Eventually the smb.conf option will be deprecated and administrative diff --git a/docs/Samba-HOWTO-Collection/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml index 1902cdd06c..5eef115bfa 100644 --- a/docs/Samba-HOWTO-Collection/SWAT.xml +++ b/docs/Samba-HOWTO-Collection/SWAT.xml @@ -394,7 +394,7 @@ to us so we will include this in the next release of Samba. The msg -Note that if you enable this feature and the display charset is not +Note that if you enable this feature and the is not matched to your browsers setting, the SWAT display may be corrupted. In a future version of Samba, SWAT will always display messages with UTF-8 encoding. You will then not need to set this &smb.conf; file parameter. diff --git a/docs/Samba-HOWTO-Collection/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml index 28ab3b31cf..94cfb5f411 100644 --- a/docs/Samba-HOWTO-Collection/Securing.xml +++ b/docs/Samba-HOWTO-Collection/Securing.xml @@ -88,14 +88,14 @@ before someone will find yet another vulnerability. - One of the simplest fixes in this case is to use the hosts allow and - hosts deny options in the Samba &smb.conf; configuration file to only + One of the simplest fixes in this case is to use the and + options in the Samba &smb.conf; configuration file to only allow access to your server from a specific range of hosts. An example might be: -hosts allow127.0.0.1 192.168.2.0/24 192.168.3.0/24 -hosts deny0.0.0.0/0 +127.0.0.1 192.168.2.0/24 192.168.3.0/24 +0.0.0.0/0 @@ -116,7 +116,7 @@ before someone will find yet another vulnerability. -valid users@smbusers, jacko +@smbusers, jacko @@ -142,8 +142,8 @@ before someone will find yet another vulnerability. -interfaceseth* lo -bind interfaces onlyyes +eth* lo +yes @@ -212,8 +212,8 @@ before someone will find yet another vulnerability. [IPC$] -hosts allow192.168.115.0/24 127.0.0.1 -hosts deny0.0.0.0/0 +192.168.115.0/24 127.0.0.1 +0.0.0.0/0 @@ -343,19 +343,19 @@ out to be a security problem request are totally convinced that the problem is w - Samba allows the behavior you require. Simply put the only user%S + Samba allows the behavior you require. Simply put the %S option in the [homes] share definition. - The only user works in conjunction with the userslist, + The works in conjunction with the list, so to get the behavior you require, add the line : -users%S +%S this is equivalent to adding -valid users%S +%S to the definition of the [homes] share, as recommended in the &smb.conf; man page. diff --git a/docs/Samba-HOWTO-Collection/ServerType.xml b/docs/Samba-HOWTO-Collection/ServerType.xml index 8a0fb01c90..efb37202ab 100644 --- a/docs/Samba-HOWTO-Collection/ServerType.xml +++ b/docs/Samba-HOWTO-Collection/ServerType.xml @@ -200,7 +200,7 @@ The &smb.conf; parameter that sets user level security is: -securityuser +user @@ -236,7 +236,7 @@ Many clients send a session setup even if the server is in Share Level security. normally send a valid username but no password. Samba records this username in a list of possible usernames. When the client then does a tree connection it also adds to this list the name of the share they try to connect to (useful for home directories) and any users -listed in the user parameter in the &smb.conf; file. +listed in the parameter in the &smb.conf; file. The password is then checked in turn against these possible usernames. If a match is found then the client is authenticated as that user. @@ -249,7 +249,7 @@ The &smb.conf; parameter that sets Share Level security is: -securityshare +share @@ -260,7 +260,7 @@ The &smb.conf; parameter that sets Share Level security is: Domain Member -When Samba is operating in securitydomain mode, +When Samba is operating in domain mode, the Samba server has a domain security trust account (a machine account) and causes all authentication requests to be passed through to the Domain Controllers. In other words, this configuration makes the Samba server a Domain Member server. @@ -279,8 +279,8 @@ This method involves addition of the following parameters in the &smb.conf; file -securitydomain -workgroup&example.workgroup; +domain +&example.workgroup; @@ -362,8 +362,8 @@ AD-member mode can accept Kerberos tickets. Example Configuration -realmyour.kerberos.REALM -securityADS +your.kerberos.REALM +ADS @@ -371,7 +371,7 @@ The following parameter may be required: -password serveryour.kerberos.server +your.kerberos.server @@ -404,10 +404,10 @@ security mode has many drawbacks that include: In Server Security Mode the Samba server reports to the client that it is in User Level security. The client then does a session setup as described earlier. The Samba server takes the username/password that the client sends and attempts to login to the -password server by sending exactly the same username/password that + by sending exactly the same username/password that it got from the client. If that server is in User Level Security and accepts the password, then Samba accepts the client's connection. This allows the Samba server to use another SMB -server as the password server. +server as the . @@ -418,10 +418,10 @@ passwords in encrypted form. Samba supports this type of encryption by default. -The parameter securityserver means that Samba reports to clients that +The parameter server means that Samba reports to clients that it is running in user mode but actually passes off all authentication requests to another user mode server. This requires an additional -parameter password server that points to the real authentication server. +parameter that points to the real authentication server. The real authentication server can be another Samba server, or it can be a Windows NT server, the latter being natively capable of encrypted password support. @@ -447,9 +447,9 @@ This method involves the additions of the following parameters in the &smb.conf; -encrypt passwordsYes -securityserver -password server"NetBIOS_name_of_a_DC" +Yes +server +"NetBIOS_name_of_a_DC" @@ -536,24 +536,24 @@ when using clear-text authentication: -password levelinteger -username levelinteger +integer +integer By default Samba will convert to lower case the username before attempting to lookup the user in the database of local system accounts. Because UNIX usernames conventionally -only contain lower-case characters, the username level parameter +only contain lower-case characters, the parameter is rarely needed. However, passwords on UNIX systems often make use of mixed-case characters. This means that in order for a user on a Windows 9x/Me client to connect to a Samba -server using clear-text authentication, the password level +server using clear-text authentication, the must be set to the maximum number of upper case letters that could appear in a password. Note that if the server OS uses the traditional DES version -of crypt(), a password level of 8 will result in case +of crypt(), a of 8 will result in case insensitive passwords as seen from Windows users. This will also result in longer login times as Samba has to compute the permutations of the password string and try them one by one until a match is located (or all combinations fail). @@ -589,7 +589,7 @@ to those for whom English is not their native tongue. To some the nature of the Samba security mode is obvious, but entirely -wrong all the same. It is assumed that securityserver means that Samba +wrong all the same. It is assumed that server means that Samba will act as a server. Not so! This setting means that Samba will try to use another SMB server as its source for user authentication alone. @@ -600,7 +600,7 @@ to use another SMB server as its source for user authentication alone. What Makes Samba a Domain Controller? -The &smb.conf; parameter securitydomain does not really make Samba behave +The &smb.conf; parameter domain does not really make Samba behave as a Domain Controller. This setting means we want Samba to be a Domain Member. See Samba as a PDC for more information. @@ -610,7 +610,7 @@ as a Domain Controller. This setting means we want Samba to be a Domain Member. What Makes Samba a Domain Member? -Guess! So many others do. But whatever you do, do not think that securityuser +Guess! So many others do. But whatever you do, do not think that user makes Samba act as a Domain Member. Read the manufacturer's manual before the warranty expires. See Domain Membership for more information. @@ -631,9 +631,9 @@ connection whose session key would be different. So server_validate() must give -Indeed. That's why securityserver -is at best a nasty hack. Please use securitydomain; -securityserver mode is also known as pass-through authentication. +Indeed. That's why server +is at best a nasty hack. Please use domain; +server mode is also known as pass-through authentication. diff --git a/docs/Samba-HOWTO-Collection/Speed.xml b/docs/Samba-HOWTO-Collection/Speed.xml index 74c6ec2b73..2501d2bb85 100644 --- a/docs/Samba-HOWTO-Collection/Speed.xml +++ b/docs/Samba-HOWTO-Collection/Speed.xml @@ -65,7 +65,7 @@ line with the option, or in the &smb.conf; file. -The socket options section of the &smb.conf; manual page describes how +The section of the &smb.conf; manual page describes how to set these and gives recommendations. @@ -78,7 +78,7 @@ much. The correct settings are very dependent on your local network. The socket option TCP_NODELAY is the one that seems to make the biggest single difference for most networks. Many people report that adding -socket optionsTCP_NODELAY +TCP_NODELAY doubles the read performance of a Samba drive. The best explanation I have seen for this is that the Microsoft TCP/IP stack is slow in sending TCP ACKs. @@ -96,7 +96,7 @@ first be quantitatively measured on the server being configured. Read Size -The option read size affects the overlap of disk +The option affects the overlap of disk reads/writes with network reads/writes. If the amount of data being transferred in several of the SMB commands (currently SMBwrite, SMBwriteX and SMBreadbraw) is larger than this value, then the server begins writing @@ -126,7 +126,7 @@ pointless and will cause you to allocate memory unnecessarily. At startup the client and server negotiate a maximum transmit size, which limits the size of nearly all SMB commands. You can set the -maximum size that Samba will negotiate using the max xmit option +maximum size that Samba will negotiate using the option in &smb.conf;. Note that this is the maximum size of SMB requests that Samba will accept, but not the maximum size that the client will accept. The client maximum receive size is sent to Samba by the client and Samba @@ -146,7 +146,7 @@ In most cases the default is the best option. Log Level -If you set the log level (also known as debug level) higher than 2 +If you set the log level (also known as ) higher than 2 then you may suffer a large drop in performance. This is because the server flushes the log file after each operation, which can be quite expensive. @@ -157,20 +157,20 @@ expensive. Read Raw -The read raw operation is designed to be an optimized, low-latency +The operation is designed to be an optimized, low-latency file read operation. A server may choose to not support it, -however, and Samba makes support for read raw optional, with it +however, and Samba makes support for optional, with it being enabled by default. -In some cases clients do not handle read raw very well and actually +In some cases clients do not handle very well and actually get lower performance using it than they get using the conventional read operations. -So you might like to try read rawno and see what happens on your +So you might like to try no and see what happens on your network. It might lower, raise or not effect your performance. Only testing can really tell. @@ -181,13 +181,13 @@ testing can really tell. Write Raw -The write raw operation is designed to be an optimized, low-latency +The operation is designed to be an optimized, low-latency file write operation. A server may choose to not support it, however, and Samba makes support for -write raw optional, with it being enabled by default. + optional, with it being enabled by default. -Some machines may find write raw slower than normal write, in which +Some machines may find slower than normal write, in which case you may wish to change this option. @@ -198,7 +198,7 @@ case you may wish to change this option. Slow logins are almost always due to the password checking time. Using -the lowest practical password level will improve things. +the lowest practical will improve things. diff --git a/docs/Samba-HOWTO-Collection/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml index f493eae71d..bb3f81d464 100644 --- a/docs/Samba-HOWTO-Collection/StandAloneServer.xml +++ b/docs/Samba-HOWTO-Collection/StandAloneServer.xml @@ -106,15 +106,15 @@ UNIX system database. This is a simple system to administer. smb.conf for Reference Documentation Server Global parameters [global] -workgroup&example.workgroup; -netbios name&example.server.samba; -securitySHARE -passdb backendguest -wins server192.168.1.1 +&example.workgroup; +&example.server.samba; +SHARE +guest +192.168.1.1 [data] -commentData -path/export -guest onlyYes +Data +/export +Yes @@ -198,21 +198,21 @@ The contents of the &smb.conf; file is shown in the n &smb.conf; for Anonymous Printing Global parameters [global] -workgroup&example.workgroup; -netbios name&example.server.samba; -securitySHARE -passdb backendguest -printingcups -printcap namecups +&example.workgroup; +&example.server.samba; +SHARE +guest +cups +cups [printers] -commentAll Printers -path/var/spool/samba -printer adminroot -guest okYes -printableYes -use client driverYes -browseableNo +All Printers +/var/spool/samba +root +Yes +Yes +Yes +No diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml index 3e6428db5d..169bfdb5c3 100644 --- a/docs/Samba-HOWTO-Collection/Unicode.xml +++ b/docs/Samba-HOWTO-Collection/Unicode.xml @@ -94,7 +94,7 @@ Samba knows of three kinds of character sets: - unix charset + This is the charset used internally by your operating system. The default is UTF-8, which is fine for most @@ -105,14 +105,14 @@ Samba knows of three kinds of character sets: - display charset + This is the charset Samba will use to print messages on your screen. It should generally be the same as the unix charset. - dos charset + This is the charset Samba uses when communicating with DOS and Windows 9x/Me clients. It will talk unicode to all newer clients. The default depends on the charsets you have installed on your system. @@ -183,28 +183,28 @@ Setting up Japanese charsets is quite difficult. This is mainly because: Basic Parameter Setting - dos charset and - display charset + and + should be set to the locale compatible with the character set and encoding method used on Windows. This is usually CP932 but sometimes has a different name. - unix charset can be either Shift_JIS series, + can be either Shift_JIS series, EUC-JP series and UTF-8. UTF-8 is always available but the availability of other locales and its name itself depends on the system. Additionally, you can consider to use the Shift_JIS series as the - value of the unix charset + value of the parameter by using the vfs_cap module, which does the same thing as setting coding system = CAP in the Samba 2.2 series. - Where to set unix charset + Where to set to is a difficult question. Here is a list of details, advantages and disadvantages of using a certain value. @@ -376,13 +376,13 @@ Setting up Japanese charsets is quite difficult. This is mainly because: VFS CAP [global] -dos charsetCP932the locale name "CP932" may be different name -unix charsetCP932 +CP932the locale name "CP932" may be different name +CP932 ... [cap-share] -vfs optioncap +cap @@ -442,9 +442,9 @@ display charset = CP932 -dos charsetCP932 -unix charsetCP932 / eucJP-ms / UTF-8 -display charsetCP932 +CP932 +CP932 / eucJP-ms / UTF-8 +CP932 @@ -462,7 +462,7 @@ display charset = CP932 Prior to Samba-2.2 series coding system parameter is used as -unix charset parameter of the Samba-3 series. + parameter of the Samba-3 series. Next table shows the mapping table when migrating from the Samba-2.2 series to Samba-3. @@ -500,8 +500,8 @@ Prior to Samba-2.2 series coding system parameter is used as Samba is complaining about a missing CP850.so file. - Answer: CP850 is the default dos charset. - The dos charset is used to convert data to the codepage used by your dos clients. + Answer: CP850 is the default . + The is used to convert data to the codepage used by your dos clients. If you do not have any dos clients, you can safely ignore this message. CP850 should be supported by your local iconv implementation. Make sure you have all the required packages installed. diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml index fe01973d97..d448d14c53 100644 --- a/docs/Samba-HOWTO-Collection/VFS.xml +++ b/docs/Samba-HOWTO-Collection/VFS.xml @@ -36,18 +36,18 @@ on different systems. They currently have been tested against GNU/Linux and IRIX To use the VFS modules, create a share similar to the one below. The -important parameter is the vfs objects parameter where +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 [audit] -commentAudited /data directory -path/data -vfs objectsaudit recycle -writeableyes -browseableyes +Audited /data directory +/data +audit recycle +yes +yes @@ -57,7 +57,7 @@ Let's say that you want to both have a virus scanner module and a recycle bin module. It is wise to put the virus scanner module as the first one so that it is the first that get run an may detect a virus immediately, before any action is performed on that file. -vfs objectsvscan-clamav recycle +vscan-clamav recycle @@ -73,14 +73,14 @@ This can be done using a configuration similar to the one shown in smb.conf with multiple VFS modules [test] -commentVFS TEST -path/data -writeableyes -browseableyes -vfs objectsexample:example1 example example:test -example1: parameter1 -example: parameter5 -test: parameter7 +VFS TEST +/data +yes +yes +example:example1 example example:test +1 +5 +7 @@ -111,7 +111,7 @@ This can be done using a configuration similar to the one shown in This module is identical with the audit module above except that it sends audit logs to both syslog as well as the smbd log files. The - log level for this module is set in the &smb.conf; file. + for this module is set in the &smb.conf; file. @@ -161,7 +161,7 @@ This can be done using a configuration similar to the one shown in Auditing information often must be preserved for a long time. So that the log files do not get rotated - it is essential that the max log size0 be set + it is essential that the 0 be set in the &smb.conf; file. @@ -507,11 +507,11 @@ This can be done using a configuration similar to the one shown in Share With shadow_copy VFS [shadow_share] - commentShadow Copy Enabled Share - path/data/shadow_share - vfs objectsshadow_copy - writeableyes - browseableyes + Shadow Copy Enabled Share + /data/shadow_share + shadow_copy + yes + yes diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index c3762278ee..fdb17e6e7b 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -580,17 +580,17 @@ linkend="winbindcfg">the next example, was modified to include the necess [global] <...> separate domain and username with '\', like DOMAIN\username -winbind separator\ +\ use uids from 10000 to 20000 for domain users -idmap uid10000-20000 +10000-20000 use gids from 10000 to 20000 for domain groups -idmap gid10000-20000 +10000-20000 allow enumeration of winbind users and groups -winbind enum usersyes -winbind enum groupsyes +yes +yes give winbind users a real shell (only needed if they have telnet access) -template homedir/home/winnt/%D/%U -template shell/bin/bash +/home/winnt/%D/%U +/bin/bash @@ -709,7 +709,7 @@ your PDC. For example, I get the following response: -Obviously, I have named my domain CEO and my winbind separator is \. +Obviously, I have named my domain CEO and my is \. @@ -996,11 +996,11 @@ have individual directories for the domain users already present on the server, or change the home directory template to a general directory for all domain users. These can be easily set using the &smb.conf; global entry -template homedir. +. - The directory in template homedir is not created automatically! Use pam_mkhomedir or pre-create + The directory in is not created automatically! Use pam_mkhomedir or pre-create the directories of users to make sure users can log in on UNIX with their own home directory. @@ -1208,8 +1208,8 @@ cost of running a mixed UNIX and NT network. My &smb.conf; file is correctly configured. I have specified - idmap uid12000, - and idmap gid3000-3500 + 12000, + and 3000-3500 and winbind is running. When I do the following it all works fine. diff --git a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml index 86cf7100ba..f521896a71 100644 --- a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml +++ b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml @@ -457,7 +457,7 @@ The most common reasons for which a Windows NT/200x/XP Professional client canno - &smb.conf; does not have correct add machine script settings. + &smb.conf; does not have correct settings. root account is not in password backend database. Attempt to use a user account instead of the root account to join a machine to the domain. Open connections from the workstation to the server. diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml index 3c85e991ee..d3b8e99501 100644 --- a/docs/Samba-HOWTO-Collection/locking.xml +++ b/docs/Samba-HOWTO-Collection/locking.xml @@ -87,13 +87,13 @@ a file. Unfortunately with the way fcntl() works, this can be slow and may overs the rpc.lockd. This is almost always unnecessary as clients are supposed to independently make locking calls before reads and writes if locking is important to them. By default, Samba only makes locking calls when explicitly asked -to by a client, but if you set strict lockingyes, it +to by a client, but if you set yes, it will make lock checking calls on every read and write call. You can also disable byte range locking completely by using -lockingno. +no. This is useful for those shares that do not support locking or do not need it (such as CDROMs). In this case, Samba fakes the return codes of locking calls to tell clients that everything is okay. @@ -414,7 +414,7 @@ the share. Samba includes an &smb.conf; parameter called -force user that changes + that changes the user accessing a share from the incoming user to whatever user is defined by the smb.conf variable. If opportunistic locking is enabled on a share, the change in user access causes an oplock break to be sent @@ -431,7 +431,7 @@ Avoid the combination of the following: - force user in the &smb.conf; share configuration. + in the &smb.conf; share configuration. @@ -454,8 +454,8 @@ administrator to adjust various properties of the oplock mechanism to account for timing and usage levels. These parameters provide good versatility for implementing oplocks in environments where they would likely cause problems. The parameters are: -oplock break wait time, -oplock contention limit. +, +. @@ -601,8 +601,8 @@ You can disable oplocks on a per-share basis with the following: [acctdata] -oplocksFalse -level2 oplocksFalse +False +False @@ -617,7 +617,7 @@ Alternately, you could disable oplocks on a per-file basis within the share: -veto oplock files/*.mdb/*.MDB/*.dbf/*.DBF/ +/*.mdb/*.MDB/*.dbf/*.DBF/ @@ -647,7 +647,7 @@ basis in the &smb.conf; file. -kernel oplocksyes +yes The default is no. @@ -670,15 +670,15 @@ enabled on a per-share basis, or globally for the entire server, in the Share with some files oplocked [global] -veto oplock files/filename.htm/*.txt/ +/filename.htm/*.txt/ [share_name] -veto oplock files/*.exe/filename.ext/ +/*.exe/filename.ext/ -oplock break wait time is an &smb.conf; parameter + is an &smb.conf; parameter that adjusts the time interval for Samba to reply to an oplock break request. Samba recommends: Do not change this parameter unless you have read and understood the Samba oplock code. Oplock break Wait Time can only be configured globally in the &smb.conf; file as shown below. @@ -686,7 +686,7 @@ Oplock break Wait Time can only be configured globally in the &smb.conf; file as -oplock break wait time 0 (default) + 0 (default) @@ -703,10 +703,10 @@ the entire server, in the &smb.conf; file as shown in . Configuration with oplock break contention limit [global] -oplock break contention limit 2 (default) + 2 (default) [share_name] -oplock break contention limit 2 (default) + 2 (default) diff --git a/docs/Samba-HOWTO-Collection/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml index 97ddfceec2..c6ad6dfa46 100644 --- a/docs/Samba-HOWTO-Collection/msdfs.xml +++ b/docs/Samba-HOWTO-Collection/msdfs.xml @@ -38,9 +38,9 @@ A Samba server can be made a DFS server by setting the global - Boolean host msdfs + Boolean parameter in the &smb.conf; file. You designate a share as a DFS - root using the Share Level Boolean msdfs root parameter. A DFS root directory on Samba hosts DFS + root using the Share Level Boolean parameter. A DFS root directory on Samba hosts DFS links in the form of symbolic links that point to other servers. For example, a symbolic link junction->msdfs:storage1\share1 in the share directory acts as the DFS junction. When DFS-aware clients attempt to access the junction link, @@ -65,12 +65,12 @@ smb.conf with DFS configured [global] -netbios name&example.server.samba; -host msdfs yes +&example.server.samba; +yes [dfs] -path/export/dfsroot -msdfs rootyes +/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 82bbe94693..d0e2ecdf0d 100644 --- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml +++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml @@ -21,9 +21,9 @@ the move from 2.2.x to 3.0.0. Samba-3.0.0 default behavior should be approximately the same as Samba-2.2.x. -The default behavior when the new parameter passdb backend +The default behavior when the new parameter is not defined in the &smb.conf; file provides the same default behavior as Samba-2.2.x -with encrypt passwordsYes, and +with Yes, and will use the smbpasswd database. @@ -37,7 +37,7 @@ preserved across the upgrade. If the Samba-2.2.x system was using an LDAP backend, and there is no time to update the LDAP -database, then make sure that passdb backendldapsam_compat +database, then make sure that ldapsam_compat is specified in the &smb.conf; file. For the rest, behavior should remain more or less the same. At a later date, when there is time to implement a new Samba-3 compatible LDAP backend, it is possible to migrate the old LDAP database to the new one through use of the pdbedit. @@ -435,7 +435,7 @@ complete descriptions of new or modified parameters. - Inclusion of new securityads option for integration + Inclusion of new ads option for integration with an Active Directory domain using the native Windows Kerberos 5 and LDAP protocols. @@ -443,9 +443,9 @@ complete descriptions of new or modified parameters. Samba-3 also includes the possibility of setting up chains of authentication methods - (auth methods) and account + () and account storage backends - (passdb backend). + (). Please refer to the &smb.conf; man page and Account Information Databases, for details. While both parameters assume sane default values, it is likely that you will need to understand what the @@ -589,10 +589,10 @@ complete descriptions of new or modified parameters. [global] ... - idmap backendldap:ldap://onterose/ - ldap idmap suffixou=idmap,dc=quenya,dc=org - idmap uid40000-50000 - idmap gid40000-50000 + ldap:ldap://onterose/ + ou=idmap,dc=quenya,dc=org + 40000-50000 + 40000-50000 diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml index 2bd5385d8b..c7366fcea8 100644 --- a/docs/manpages/nmbd.8.xml +++ b/docs/manpages/nmbd.8.xml @@ -54,7 +54,7 @@ specified it will respond with the IP number of the host it is running on. Its "own NetBIOS name" is by default the primary DNS name of the host it is running on, - but this can be overridden by the netbios name + but this can be overridden by the in &smb.conf;. Thus nmbd will reply to broadcast queries for its own name(s). Additional names for nmbd to respond on can be set @@ -129,7 +129,7 @@ NetBIOS lmhosts file. The lmhosts file is a list of NetBIOS names to IP addresses that is loaded by the nmbd server and used via the name - resolution mechanism name resolve order described in smb.conf + resolution mechanism described in smb.conf 5 to resolve any NetBIOS name queries needed by the server. Note that the contents of this file are NOT @@ -201,7 +201,7 @@ and /etc/samba/smb.conf. When run as a WINS server (see the - wins support + parameter in the smb.conf 5 man page), nmbd @@ -210,7 +210,7 @@ wherever Samba was configured to install itself. If nmbd is acting as a - browse master (see the local master + browse master (see the parameter in the smb.conf 5 man page, nmbd will store the browsing database in the file browse.dat diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml index 84799ee75d..85052fb71a 100644 --- a/docs/manpages/ntlm_auth.1.xml +++ b/docs/manpages/ntlm_auth.1.xml @@ -160,7 +160,7 @@ Username The username, expected to be in - Samba's unix charset. + Samba's . Username: bob @@ -170,7 +170,7 @@ Username The user's domain, expected to be in - Samba's unix charset. + Samba's . Domain: WORKGROUP @@ -182,7 +182,7 @@ The fully qualified username, expected to be in Samba's unix charset and qualified with the - winbind separator. + . Full-Username: WORKGROUP\bob diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml index ecb70d917a..041cc75b98 100644 --- a/docs/manpages/pdbedit.8.xml +++ b/docs/manpages/pdbedit.8.xml @@ -257,7 +257,7 @@ retype new password pdbedit does not call the unix password syncronisation - script if unix password sync + script if has been set. It only updates the data in the Samba user database. diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml index 00448dc5bb..1c19878de0 100644 --- a/docs/manpages/rpcclient.1.xml +++ b/docs/manpages/rpcclient.1.xml @@ -54,7 +54,7 @@ server NetBIOS name of Server to which to connect. The server can be any SMB/CIFS server. The name is - resolved using the name resolve order line from smb.conf + resolved using the line from smb.conf 5. diff --git a/docs/manpages/smb.conf.5.xml b/docs/manpages/smb.conf.5.xml index 149ea3d382..57a5d62bc0 100644 --- a/docs/manpages/smb.conf.5.xml +++ b/docs/manpages/smb.conf.5.xml @@ -105,8 +105,8 @@ [foo] - path/home/bar - read onlyread only = no + /home/bar + read only = no The following sample section defines a printable share. @@ -118,10 +118,10 @@ [aprinter] - path/usr/spool/public - read onlyyes - printableyes - guest okyes + /usr/spool/public + yes + yes + yes @@ -188,7 +188,7 @@ [homes] - read onlyno + no An important point is that if guest access is specified @@ -250,9 +250,9 @@ [printers] - path/usr/spool/public - guest okyes - printableyes + /usr/spool/public + yes + yes All aliases given for a printer in the printcap file diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml index 8b7007b1be..3f5755c2da 100644 --- a/docs/manpages/smbd.8.xml +++ b/docs/manpages/smbd.8.xml @@ -136,7 +136,7 @@ -p <port number(s)> port number(s) is a space or comma-separated list of TCP ports smbd should listen on. - The default value is taken from the ports parameter in &smb.conf; + The default value is taken from the parameter in &smb.conf; The default ports are 139 (used for SMB over NetBIOS over TCP) and port 445 (used for plain SMB over TCP). @@ -225,7 +225,7 @@ Samba uses PAM for authentication (when presented with a plaintext password), for account checking (is this account disabled?) and for session management. The degree too which samba supports PAM is restricted - by the limitations of the SMB protocol and the obey pam restrictions smb.conf + by the limitations of the SMB protocol and the smb.conf 5 paramater. When this is set, the following restrictions apply: diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml index 0e41ae9410..fa2ed9e9b8 100644 --- a/docs/manpages/smbpasswd.8.xml +++ b/docs/manpages/smbpasswd.8.xml @@ -313,7 +313,7 @@ This parameter is only available if Samba has been compiled with LDAP support. The -w switch is used to specify the password to be used with the - ldap admin dn. Note that the password is stored in + . Note that the password is stored in the secrets.tdb and is keyed off of the admin's DN. This means that if the value of ldap admin dn ever changes, the password will need to be diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml index dd98cfd8e5..1ad8a6ff1e 100644 --- a/docs/manpages/winbindd.8.xml +++ b/docs/manpages/winbindd.8.xml @@ -42,8 +42,8 @@ service to smbd, ntlm_auth and the pam_winbind.so PAM module, by managing connections to domain controllers. In this configuraiton the - idmap uid and - idmap gid + and + parameters are not required. (This is known as `netlogon proxy only mode'.) The Name Service Switch allows user @@ -229,25 +229,25 @@ hosts: files wins - winbind separator + - idmap uid + - idmap gid + - idmap backend + - winbind cache time + - winbind enum users + - winbind enum groups + - template homedir + - template shell + - winbind use default domain + diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index e82f219cf4..39e9e0a16b 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -7,10 +7,8 @@ (C) Alexander Bokovoy 2002-2004 --> + version="1.1"> @@ -83,18 +81,18 @@ - + <?latex \hspace{1cm} ?> - + - + = - + @@ -126,7 +124,7 @@ - + diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl index 95650cfb77..a6e7f98e16 100644 --- a/docs/xslt/generate-attributions.xsl +++ b/docs/xslt/generate-attributions.xsl @@ -4,7 +4,6 @@ (C) Jelmer Vernooij 2003 --> @@ -57,7 +56,7 @@ < - + 1 diff --git a/docs/xslt/sambadoc2pearson.xsl b/docs/xslt/sambadoc2pearson.xsl index d98e4485f0..23bc30985c 100644 --- a/docs/xslt/sambadoc2pearson.xsl +++ b/docs/xslt/sambadoc2pearson.xsl @@ -23,7 +23,7 @@ - = + = @@ -78,10 +78,10 @@ - - + + = - + diff --git a/docs/xslt/upgrade.pl b/docs/xslt/upgrade.pl new file mode 100644 index 0000000000..8f0a82f0e7 --- /dev/null +++ b/docs/xslt/upgrade.pl @@ -0,0 +1,10 @@ +#!/usr/bin/perl +# Update documents to the Samba DTD V1.0 + +undef $/; + +while(<>) { + s/(.*?)<\/name>(.*?)<\/value><\/smbconfoption>/\2<\/smbconfoption>/g; + s/(.*?)<\/name><\/smbconfoption>//g; + print $_; +} -- cgit