From bfc9d701873454ff562fa184b1fc104fb6b60db3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Mar 2005 17:28:48 +0000 Subject: [PATCH] Another set of validation updates --- .../AdvancedNetworkAdmin.xml | 22 +-- docs/Samba-HOWTO-Collection/Bugs.xml | 2 +- docs/Samba-HOWTO-Collection/CUPS-printing.xml | 162 ++++++++++++--------- docs/Samba-HOWTO-Collection/DomainMember.xml | 8 +- docs/Samba-HOWTO-Collection/FastStart.xml | 13 +- docs/Samba-HOWTO-Collection/Group-Mapping.xml | 4 +- docs/Samba-HOWTO-Collection/InterdomainTrusts.xml | 11 +- docs/Samba-HOWTO-Collection/IntroSMB.xml | 2 +- docs/Samba-HOWTO-Collection/NT4Migration.xml | 2 +- docs/Samba-HOWTO-Collection/NetworkBrowsing.xml | 5 +- docs/Samba-HOWTO-Collection/Other-Clients.xml | 6 +- docs/Samba-HOWTO-Collection/Passdb.xml | 23 +-- docs/Samba-HOWTO-Collection/PolicyMgmt.xml | 8 +- docs/Samba-HOWTO-Collection/Printing.xml | 11 +- docs/Samba-HOWTO-Collection/Problems.xml | 6 +- docs/Samba-HOWTO-Collection/ProfileMgmt.xml | 6 +- docs/Samba-HOWTO-Collection/SWAT.xml | 4 +- docs/Samba-HOWTO-Collection/Unicode.xml | 7 +- docs/Samba-HOWTO-Collection/VFS.xml | 3 +- docs/Samba-HOWTO-Collection/Winbind.xml | 9 +- .../Samba-HOWTO-Collection/WindowsClientConfig.xml | 47 +++--- docs/Samba-HOWTO-Collection/foreword-tridge.xml | 2 +- docs/Samba-HOWTO-Collection/glossary.xml | 2 +- docs/Samba-HOWTO-Collection/locking.xml | 10 +- docs/xslt/expand-sambadoc.xsl | 6 - docs/xslt/generate-attributions.xsl | 2 +- 26 files changed, 213 insertions(+), 170 deletions(-) diff --git a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml index 3904fd17080..72892f3806f 100644 --- a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml +++ b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml @@ -55,9 +55,9 @@ on Windows 9x/Me systems. The tools set includes: - Server Manager - User Manager for Domains - Event Viewer + Server Manager + User Manager for Domains + Event Viewer @@ -221,12 +221,12 @@ There are several opportunities for creating a custom network startup configurat - No Logon Script. - Simple universal Logon Script that applies to all users. - Use of a conditional Logon Script that applies per user or per group attributes. - Use of Samba's preexec and postexec functions on access to the NETLOGON share to create - a custom logon script and then execute it. - User of a tool such as KixStart. + No Logon Script. + Simple universal Logon Script that applies to all users. + Use of a conditional Logon Script that applies per user or per group attributes. + Use of Samba's preexec and postexec functions on access to the NETLOGON share to create + a custom logon script and then execute it. + User of a tool such as KixStart. @@ -327,8 +327,8 @@ Those wishing to use more elaborate or capable logon processing system should ch - http://www.craigelachie.org/rhacer/ntlogon - http://www.kixtart.org + http://www.craigelachie.org/rhacer/ntlogon + http://www.kixtart.org diff --git a/docs/Samba-HOWTO-Collection/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml index 4fe03c983ba..ae4354f5d69 100644 --- a/docs/Samba-HOWTO-Collection/Bugs.xml +++ b/docs/Samba-HOWTO-Collection/Bugs.xml @@ -151,7 +151,7 @@ prepared for a large volume of log data. allpassdb tdbsam - printdriversauth + printdriversauth lanmanwinbind smbvfs rpc_parseidmap diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml index 21784ef2d6e..145422fe7eb 100644 --- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml +++ b/docs/Samba-HOWTO-Collection/CUPS-printing.xml @@ -414,9 +414,9 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) In /etc/cups/mime.types, make sure this line is present: - + application/octet-stream - + /etc/cups/mime.convs /etc/cups/mime.types @@ -426,9 +426,9 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) application/vnd.cups-raw - + application/octet-stream application/vnd.cups-raw 0 - - + If these two files are not set up correctly for raw Windows client printing, you may encounter the dreaded Unable to @@ -639,7 +639,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - Windows printing to a local printer.1small + + Windows printing to a local printer. + 1small + @@ -732,8 +735,10 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - Printing to a PostScript printer. - 2small + + Printing to a PostScript printer. + 2small + @@ -973,9 +978,9 @@ for mime.types and in the comments section of the like this: application/pdf - + application/pdf pdf string(0,%PDF) - + This means if a filename has either a .pdf suffix or if the magic @@ -984,9 +989,9 @@ beginning of the file itself (offset 0 from the start), then it is a PDF file (application/pdf). Another rule is this: - + application/postscript ai eps ps string(0,%!) string(0,<04>%!) - + If the filename has one of the suffixes .ai, .eps, @@ -1040,9 +1045,9 @@ conversion filter that can produce the output from the input type and virtual costs associated with this conversion. One example line reads like this: - + application/pdf application/postscript 33 pdftops - + This means that the pdftops filter will take application/pdf as input and produce @@ -1052,27 +1057,27 @@ expensive, costing 66 CUPS-$: pdf - + application/vnd.hp-HPGL application/postscript 66 hpgltops - + This is the hpgltops, which processes HP-GL plotter files to PostScript. application/octet-stream - + application/octet-stream - + Here are two more examples: text/plain - + application/x-shell application/postscript 33 texttops text/plain application/postscript 33 texttops - + The last two examples name the texttops filter to work on text/plain as well as on application/x-shell. (Hint: @@ -1172,9 +1177,10 @@ print options already embedded into the file. - Pre-filtering in CUPS to form PostScript. - 4small - + + Pre-filtering in CUPS to form PostScript. + 4small + @@ -1191,8 +1197,8 @@ stapling and punching it, and so on) into the PostScript file. - Adding device-specific print options. - 5small + Adding device-specific print options. + 5small @@ -1232,7 +1238,10 @@ that are able to generate device-specific printer data. - PostScript to intermediate raster format.6small + + PostScript to intermediate raster format. + 6small + @@ -1249,7 +1258,8 @@ than one vendor financing the development of CUPS raster drivers). - CUPS-raster production using Ghostscript. + + CUPS-raster production using Ghostscript. 7small @@ -1285,7 +1295,8 @@ filtering on next picture. - Image format to CUPS-raster format conversion. + + Image format to CUPS-raster format conversion. 8small @@ -1310,7 +1321,8 @@ closely as possible with CUPS. - Raster to printer-specific formats. + + Raster to printer-specific formats. 9small @@ -1468,9 +1480,9 @@ Printer & Driver Database at Linuxprinting.org. You can recognize these PPDs from the line calling the cupsomatic filter: - + *cupsFilter: "application/vnd.cups-postscript 0 cupsomatic" - + You may find this line among the first 40 or so lines of the PPD file. If you have such a PPD installed, the printer shows up in the @@ -1491,9 +1503,9 @@ and more powerful successor is now in a stable beta-version: it is called foomatic-rip as a filter with CUPS, you need the new-type PPDs. These have a similar but different line: - + *cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" - + The PPD generating engine at Linuxprinting.org has been revamped. The new PPDs comply to the Adobe spec. On top, they also provide a @@ -1613,18 +1625,18 @@ make sure this line is present: application/octet-stream - + application/octet-stream - + This line (with no specific auto-typing rule set) makes all files not otherwise auto-typed a member of application/octet-stream. In /etc/cups/mime.convs, have this line: - + application/octet-stream application/vnd.cups-raw 0 - - + MIME @@ -1686,9 +1698,9 @@ CUPS. The most important one looks similar to this: application/vnd.cups-raster - + *cupsFilter: application/vnd.cups-raster 66 rastertoprinter - + It is the last piece in the CUPS filtering puzzle. This line tells the CUPS daemon to use as a last filter rastertoprinter. This filter @@ -1776,7 +1788,8 @@ advantages) than other methods. - cupsomatic/foomatic Processing versus Native CUPS. + + cupsomatic/foomatic Processing versus Native CUPS. 10small @@ -1785,8 +1798,8 @@ advantages) than other methods. One other method is the cupsomatic/foomatic-rip way. Note that cupsomatic is not made by the CUPS developers. It is an independent contribution to printing development, -made by people from Linuxprinting.org see also http://www.cups.org/cups-help.html. +made by people from Linuxprinting.org see also http://www.cups.org/cups-help.html. cupsomatic is no longer developed and maintained and is no longer supported. It has now been replaced by foomatic-rip. foomatic-rip is a complete re-write @@ -1867,7 +1880,10 @@ backend, which transfers the job to the printers. The resulting filter chain, therefore, is as drawn in PDF to socket chain. - pdftosocketPDF to socket chain. + + PDF to socket chain. + pdftosocket + @@ -1918,7 +1934,10 @@ which transfers the job to the printers. The resulting filter chain therefore is as drawn in this figure. -pdftoepsonusbPDF to USB chain. + + PDF to USB chain. + pdftoepsonusb + @@ -2061,7 +2080,8 @@ clients. - Print driver execution on the client. + + Print driver execution on the client. 11small @@ -2087,7 +2107,8 @@ understand. - Print driver execution on the server. + + Print driver execution on the server. 12small @@ -2159,9 +2180,10 @@ simply use sysv). -Printing via CUPS/Samba server. - 13small - + + Printing via CUPS/Samba server. + 13small + @@ -3085,7 +3107,8 @@ not intended to, and does not work with, raw queues! - cupsaddsmb flowchart. + + cupsaddsmb flowchart. 14small @@ -3791,7 +3814,7 @@ back. point 'n' print -&dosprompt;rundll32 printui.dll,PrintUIEntry /in /n \\sambaserver\mysmbtstprn +&dosprompt;rundll32 printui.dll,PrintUIEntry /in /n "\\sambaserver\mysmbtstprn" @@ -4831,9 +4854,9 @@ in. cupsomatic bypasses pstoraster, kidnaps the printfile from CUPS away and redirects it to go through Ghostscript. CUPS accepts this, because the associated cupsomatic/foomatic-PPD specifies: - + *cupsFilter: "application/vnd.cups-postscript 0 cupsomatic" - + This line persuades CUPS to hand the file to cupsomatic, once it has successfully converted it to the MIME type @@ -4848,10 +4871,10 @@ CUPS is widely configurable and flexible, even regarding its filtering mechanism. Another workaround in some situations would be to have in /etc/cups/mime.types entries as follows: - + application/postscript application/vnd.cups-raw 0 - application/vnd.cups-postscript application/vnd.cups-raw 0 - - + This would prevent all PostScript files from being filtered (rather, they will through the virtual nullfilter @@ -4859,9 +4882,9 @@ denoted with -). This could only be useful for PS printers. If yo want to print PS code on non-PS printers (provided they support ASCII text printing), an entry as follows could be useful: - + */* application/vnd.cups-raw 0 - - + and would effectively send all files to the backend without further processing. @@ -4870,10 +4893,10 @@ backend without further processing. You could have the following entry: - + application/vnd.cups-postscript application/vnd.cups-raw 0 \ my_PJL_stripping_filter - + You will need to write a my_PJL_stripping_filter (which could be a shell script) that parses the PostScript and removes the @@ -5082,9 +5105,9 @@ for: You can include the required parameters as part of the - smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename - smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename - smb://username:password@WINDOWSNETBIOSNAME/printersharename + smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename + smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename + smb://username:password@WINDOWSNETBIOSNAME/printersharename @@ -5108,9 +5131,15 @@ feature of CUPS and you do not necessarily need to have smbd running. The following diagrams reveal how CUPS handles print jobs. -cups1Filtering chain 1. + + Filtering chain 1. + cups1 + -cups2Filtering chain with cupsomatic + + Filtering chain with cupsomatic + cups2 + @@ -5411,8 +5440,8 @@ the other way round: /var/spool/cups/ is set as section). These must be different. Set RequestRoot /var/spool/cups/ in -cupsd.conf and path -/var/spool/samba in the [printers] +cupsd.conf and +/var/spool/samba in the [printers] section of &smb.conf;. Otherwise cupsd will sanitize permissions to its spool directory with each restart and printing will not work reliably. @@ -5453,7 +5482,8 @@ files from the Adobe Web site. A complete overview of the CUPS printing processes can be found in the next flowchart. -CUPS printing overview. + + CUPS printing overview. a_small diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml index 1523db98a97..0a28ac882d5 100644 --- a/docs/Samba-HOWTO-Collection/DomainMember.xml +++ b/docs/Samba-HOWTO-Collection/DomainMember.xml @@ -465,12 +465,12 @@ Server, and so on. - + When Samba is configured to use an LDAP, or other identity management and/or directory service, it is Samba that continues to perform user and machine authentication. It should be noted that the LDAP server does not perform authentication handling in place of what Samba is designed to do. - + Please refer to Domain Control, for more information regarding @@ -945,9 +945,9 @@ be logged in with Kerberos without needing to know a password. If this fails the an encryption type of DES-CBC-MD5? - + Samba can use both DES-CBC-MD5 encryption as well as ARCFOUR-HMAC-MD5 encoding. - + diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml index 2c20292670d..8b8aba656ba 100644 --- a/docs/Samba-HOWTO-Collection/FastStart.xml +++ b/docs/Samba-HOWTO-Collection/FastStart.xml @@ -378,6 +378,7 @@ Added user jackb. + Secure Read-Write File and Print Server @@ -563,13 +564,13 @@ smb: \> q - + + By now you should be getting the hang of configuration basics. Clearly, it is time to + explore slightly more complex examples. For the remainder of this chapter we will abbreviate + instructions since there are previous examples. + - - By now you should be getting the hang of configuration basics. Clearly, it is time to - explore slightly more complex examples. For the remainder of this chapter we will abbreviate - instructions since there are previous examples. - + diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index 57b43987696..40d00aba053 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -278,10 +278,10 @@ Aliases, and RIDs are shown in Well-Known User Default RIDs table. - + When the passdb backend uses LDAP (ldapsam) it is the administrators' responsibility to create the essential Domain Groups, and to assign each its default RID. - + It is permissible to create any Domain Group that may be necessary, just make certain that the essential diff --git a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml index eade579a292..cfa808066e9 100644 --- a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml +++ b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml @@ -171,7 +171,10 @@ Where a one-way trust has been established between two MS Windows NT4 domains (l DomA and DomB), the following facilities are created: -trusts1Trusts overview. + + Trusts overview. + trusts1 + @@ -421,10 +424,10 @@ Browsing from a machine in a trusted Windows 200x Domain to a Windows 200x membe a trusting samba domain, I get the following error: - + The system detected a possible attempt to compromise security. Please ensure that -you can contact the server that authenticated you. - +you can contact the server that authenticated you. + The event logs on the box I'm trying to connect to have entries regarding group diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml index 59e90bd1b72..977ef2131e9 100644 --- a/docs/Samba-HOWTO-Collection/IntroSMB.xml +++ b/docs/Samba-HOWTO-Collection/IntroSMB.xml @@ -1,5 +1,5 @@ - + &author.jht; diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml index 0eca02eb5ff..8224a73c53e 100644 --- a/docs/Samba-HOWTO-Collection/NT4Migration.xml +++ b/docs/Samba-HOWTO-Collection/NT4Migration.xml @@ -302,7 +302,7 @@ generally fit into three basic categories. Following ta The Three Major Site Types - + Number of UsersDescription diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml index 7f7aff8988b..654d2463005 100644 --- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml +++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml @@ -1423,7 +1423,10 @@ Samba is capable of cross-subnet browsing when configured correctly. Consider a network set up as in Cross-Subnet Browsing Example. -Cross-Subnet Browsing Example.browsing1 + + Cross-Subnet Browsing Example. + browsing1 + This consists of 3 subnets (1, 2, 3) connected by two routers diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml index 5d3e565f596..663dcc6fd01 100644 --- a/docs/Samba-HOWTO-Collection/Other-Clients.xml +++ b/docs/Samba-HOWTO-Collection/Other-Clients.xml @@ -50,9 +50,9 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) Basically, you need three components: - The File and Print Client (IBM Peer) - TCP/IP (Internet support) - The NetBIOS over TCP/IP driver (TCPBEUI) + The File and Print Client (IBM Peer) + TCP/IP (Internet support) + The NetBIOS over TCP/IP driver (TCPBEUI) Installing the first two together with the base operating diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml index 944a4e3c229..29bd6d296ec 100644 --- a/docs/Samba-HOWTO-Collection/Passdb.xml +++ b/docs/Samba-HOWTO-Collection/Passdb.xml @@ -94,6 +94,9 @@ as follows: + +New Backends + Samba-3 introduces a number of new password backend capabilities. SAM backendtdbsam @@ -102,9 +105,6 @@ Samba-3 introduces a number of new password backend capabilities. SAM backendxmlsam - -New Backends - tdbsam @@ -231,7 +231,10 @@ Samba-3 introduces a number of new password backend capabilities. - IDMAP: Resolution of SIDs to UIDs.idmap-sid2uid + + IDMAP: Resolution of SIDs to UIDs. + idmap-sid2uid + SID @@ -240,7 +243,10 @@ Samba-3 introduces a number of new password backend capabilities. resolution of UIDs to SIDs diagrams. - IDMAP: Resolution of UIDs to SIDs.idmap-uid2sid + + IDMAP: Resolution of UIDs to SIDs. + idmap-uid2sid + Important Notes About Security @@ -416,10 +422,9 @@ Samba-3 introduces a number of new password backend capabilities. SAM backendldapsam Example configuration with the LDAP idmap backend -SAM backendxmlsam [global] ldap:ldap://ldap-server.quenya.org:636 -Alternately, this could be specified as: +Alternately, this could be specified as: ldap:ldaps://ldap-server.quenya.org @@ -1107,7 +1112,7 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz define the DN to use when binding to the directory serversThe password for this DN is not stored in smb.conf. Rather it -must be set by using 'smbpasswd -w secretpw' to store the +must be set by using 'smbpasswd -w secretpw' to store thepassphrase in the secrets.tdb file. If the "ldap admin dn" valueschange, this password will need to be reset."cn=Manager,dc=quenya,dc=org" @@ -1423,7 +1428,7 @@ access to attrs=SambaLMPassword,SambaNTPassword The options can have the values shown in the next table. -
+
Possible <emphasis>ldap passwd sync</emphasis> values diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml index 32c2226c72c..8c12c92ede8 100644 --- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml +++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml @@ -451,10 +451,10 @@ reboot and as part of the user logon: An ordered list of user GPOs is obtained. The list contents depends on what is configured in respect of: - Is the user a Domain Member, thus subject to particular policies? - Loopback enablement, and the state of the loopback policy (Merge or Replace). - Location of the Active Directory itself. - Has the list of GPOs changed? No processing is needed if not changed. + Is the user a Domain Member, thus subject to particular policies? + Loopback enablement, and the state of the loopback policy (Merge or Replace). + Location of the Active Directory itself. + Has the list of GPOs changed? No processing is needed if not changed. diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml index 97ff8f6d0c2..aa89b1e0efa 100644 --- a/docs/Samba-HOWTO-Collection/Printing.xml +++ b/docs/Samba-HOWTO-Collection/Printing.xml @@ -1216,8 +1216,7 @@ The following parameters are frequently needed in this share section: validated by the Domain Controller in order to logon to the Windows NT session), then guest access is not necessary. Of course, in a workgroup environment where you just want to print without worrying about silly accounts and security, then configure the share for - guest access. You should consider adding map to guestBad - User in the [global] section + guest access. You should consider adding Bad User in the [global] section as well. Make sure you understand what this parameter does before using it. @@ -2255,14 +2254,14 @@ dialogs look the same, but only one of them does what you intend. You need to be Administrator or Print Administrator to do this for all users. Here is how I reproduce it in an XP Professional: -The following list needs periods after the letters and numbers::::::::: + The first wrong way: Open the Printers folder. Right-click on the printer (remoteprinter on cupshost) and - select in context menu Printing Preferences.... + select in context menu Printing Preferences.... Look at this dialog closely and remember what it looks like. @@ -2276,10 +2275,10 @@ The following list needs periods after the letters and numbers::::::::: Properties Click on the General - tab. + tab. Click on the Printing - Preferences... button. + Preferences... button. A new dialog opens. Keep this dialog open and go back to the parent dialog. diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml index 441a5840b0a..edd977b260b 100644 --- a/docs/Samba-HOWTO-Collection/Problems.xml +++ b/docs/Samba-HOWTO-Collection/Problems.xml @@ -89,7 +89,7 @@ SMB support is quite good. For details on the use of ethereal, read the well-written Ethereal User Guide. -ethereal1Starting a capture. +Starting a capture.ethereal1 Listen for data on ports 137, 138, 139, and 445. For example, use the filter port 137, port 138, port 139, or port @@ -98,7 +98,7 @@ the filter port 137, port 138, port 139, or port A console version of ethereal is available as well and is called tethereal. -ethereal2Main ethereal data window. +Main ethereal data window.ethereal2 @@ -265,7 +265,7 @@ If you do post a message to one of the lists, please observe the following guide If you have a complete Netmon trace (from the opening of the pipe to the error), you can send the *.CAP file as well. - ` + Please think carefully before attaching a document to an email. Consider pasting the relevant parts into the body of the message. The Samba mailing lists go to a huge number of people. Do they all need a copy of your diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml index 4046b86ff8c..028762dfc78 100644 --- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml +++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml @@ -999,9 +999,9 @@ per-user settings using the Domain User Manager (as with MS Windows NT4/ Win 200 In any case, you can configure only one profile per user. That profile can be either: - A profile unique to that user. - A mandatory profile (one the user cannot change). - A group profile (really should be mandatory, that is unchangable). + A profile unique to that user. + A mandatory profile (one the user cannot change). + A group profile (really should be mandatory, that is unchangable). diff --git a/docs/Samba-HOWTO-Collection/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml index a56c6016bd0..349312d61a5 100644 --- a/docs/Samba-HOWTO-Collection/SWAT.xml +++ b/docs/Samba-HOWTO-Collection/SWAT.xml @@ -357,7 +357,7 @@ and the SSL connection is up. SWAT can be configured to display its messages to match the settings of the language configurations of your Web browser. It will be passed to SWAT in the Accept-Language header of the HTTP request. - + To enable this feature: @@ -393,7 +393,7 @@ and so on. If you find a mistake or create a new msg file, pl to us so we will include this in the next release of Samba. The msg file should be encoded in UTF-8. - + 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 diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml index 7d6abc659cb..cf29ef2b7a1 100644 --- a/docs/Samba-HOWTO-Collection/Unicode.xml +++ b/docs/Samba-HOWTO-Collection/Unicode.xml @@ -116,7 +116,7 @@ Samba knows of three kinds of character sets: 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. - Run testparm -v | grep dos charset to see + Run testparm -v | grep "dos charset" to see what the default is on your system. @@ -376,10 +376,11 @@ Setting up Japanese charsets is quite difficult. This is mainly because: VFS CAP [global] -CP932the locale name "CP932" may be different name +the locale name "CP932" may be different +CP932 CP932 -... +... [cap-share] cap diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml index 5ee603564f1..73244b4c8f6 100644 --- a/docs/Samba-HOWTO-Collection/VFS.xml +++ b/docs/Samba-HOWTO-Collection/VFS.xml @@ -154,8 +154,7 @@ This can be done using a configuration similar to the one shown in log file settings. An example of detailed per-user and per-machine logging can be obtained by setting - log level - /var/log/samba/%U.%m.log. + /var/log/samba/%U.%m.log. diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml index 2edf8c69464..21ed578fa8a 100644 --- a/docs/Samba-HOWTO-Collection/Winbind.xml +++ b/docs/Samba-HOWTO-Collection/Winbind.xml @@ -21,8 +21,8 @@ JohnTrostel -
jtrostel@snapserver.com
SNAP +
jtrostel@snapserver.com
 @@ -575,10 +575,11 @@ are described in more detail in the winbinddthe next example, was modified to include the necessary entries in the [global] section. - + + smb.conf for Winbind set-up [global] - <...> +<...> separate domain and username with '\', like DOMAIN\username \ use uids from 10000 to 20000 for domain users @@ -1237,10 +1238,12 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false But the following command just fails: + &rootprompt;chown maryo a_file chown: `maryo': invalid user + This is driving me nuts! What can be wrong? diff --git a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml index 5d4b8fc40f7..be080638f6b 100644 --- a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml +++ b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml @@ -105,7 +105,10 @@ that are in common use today. These are: The default setting is DHCP enabled operation. (i.e., Obtain an IP address automatically). See . - WXPP003Internet Protocol (TCP/IP) Properties. + + Internet Protocol (TCP/IP) Properties. + WXPP003 + @@ -125,7 +128,7 @@ that are in common use today. These are: The technical name for the additional addresses is IP Aliases, and additionally this panel permits the setting of more default gateways (routers). In most cases where DHCP is used, it will not be necessary to create additional settings. See to see the appearance of this panel. - WXPP005Advanced Network Settings + Advanced Network SettingsWXPP005 @@ -136,7 +139,7 @@ that are in common use today. These are: Click the DNS tab to add DNS server settings. The example system uses manually configured DNS settings. When finished making changes, click the OK to commit the settings. See . - WXPP014DNS Configuration. + DNS Configuration.WXPP014 @@ -144,7 +147,7 @@ that are in common use today. These are: This step demonstrates an example system that uses manually configured WINS settings. When finished making, changes click the OK to commit the settings. See . - WXPP009WINS Configuration + WINS ConfigurationWXPP009 @@ -174,7 +177,7 @@ that are in common use today. These are: Right click on Local Area Connection, now click the Properties. See . - w2kp001Local Area Connection Properties. + Local Area Connection Properties.w2kp001 @@ -185,7 +188,7 @@ that are in common use today. These are: The default setting is DHCP enabled operation. (i.e., Obtain an IP address automatically). See . - w2kp002Internet Protocol (TCP/IP) Properties. + Internet Protocol (TCP/IP) Properties.w2kp002 @@ -203,7 +206,7 @@ that are in common use today. These are: Click the Advanced button to proceed with TCP/IP configuration. Refer to . - w2kp003Advanced Network Settings. + Advanced Network Settings.w2kp003 @@ -214,7 +217,7 @@ that are in common use today. These are: Click the DNS tab to add DNS server settings. The example system uses manually configured DNS settings. When finished making changes, click on OK to commit the settings. See . - w2kp004DNS Configuration. + DNS Configuration.w2kp004 @@ -222,7 +225,7 @@ that are in common use today. These are: This step demonstrates an example system that uses manually configured WINS settings. When finished making changes, click on OK to commit the settings. See . - w2kp005WINS Configuration. + WINS Configuration.w2kp005 @@ -253,7 +256,7 @@ that are in common use today. These are: In the box labeled The following network components are installed:, click on Internet Protocol TCP/IP, now click on the Properties button. See . - WME001The Windows Me Network Configuration Panel. + The Windows Me Network Configuration Panel.WME001 @@ -262,7 +265,7 @@ that are in common use today. These are: for Microsoft Windows client support see, . The default setting on Microsoft Windows Me workstations is for DHCP enabled operation, i.e., Obtain IP address automatically is enabled. See . - WME002IP Address. + IP Address.WME002 @@ -285,14 +288,14 @@ that are in common use today. These are: The following example uses manually configured WINS settings. See . When finished making changes, click on OK to commit the settings. - WME005DNS Configuration. + DNS Configuration.WME005 This is an example of a system that uses manually configured WINS settings. One situation where this might apply is on a network that has a single DHCP server that provides settings for multiple Windows workgroups or domains. See . - WME003WINS Configuration. + WINS Configuration.WME003 @@ -323,7 +326,7 @@ that are in common use today. These are: The opening panel is the same one that can be reached by clicking System on the Control Panel. See . - wxpp001The General Panel. + The General Panel.wxpp001 @@ -336,13 +339,13 @@ that are in common use today. These are: Clicking the Network ID button will launch the configuration wizard. Do not use this with Samba-3. If you wish to change the computer name, join or leave the domain, click the Change button. See . - wxpp004The Computer Name Panel. + The Computer Name Panel.wxpp004 Click on Change. This panel shows that our example machine (TEMPTATION) is in a workgroup called WORKGROUP. We will join the domain called MIDEARTH. See . - wxpp006The Computer Name Changes Panel. + The Computer Name Changes Panel.wxpp006 @@ -351,7 +354,7 @@ that are in common use today. These are: This panel shows that our example machine (TEMPTATION) is set to join the domain called MIDEARTH. See . - wxpp007The Computer Name Changes Panel &smbmdash; Domain MIDEARTH. + The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.wxpp007 @@ -361,7 +364,7 @@ that are in common use today. These are: Enter the name root and the root password from your Samba-3 server. See . - wxpp008Computer Name Changes &smbmdash; User name and Password Panel. + Computer Name Changes &smbmdash; User name and Password Panel.wxpp008 @@ -397,7 +400,7 @@ that are in common use today. These are: The Network Configuration Panel allows all common network settings to be changed. See . - WME009The Network Panel. + The Network Panel.WME009 @@ -409,7 +412,7 @@ that are in common use today. These are: The Client for Microsoft Networks Properties panel is the correct location to configure network logon settings. See . - WME010Client for Microsoft Networks Properties Panel. + Client for Microsoft Networks Properties Panel.WME010 @@ -420,14 +423,14 @@ that are in common use today. These are: Click on the Identification button. This is the location at which the workgroup (domain) name and the machine name (computer name) need to be set. See . - WME013Identification Panel. + Identification Panel.WME013 Now click the Access Control button. If you want to be able to assign share access permissions using domain user and group accounts, it is necessary to enable User-level access control as shown in this panel. See . - WME014Identification Panel. + Identification Panel.WME014 diff --git a/docs/Samba-HOWTO-Collection/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/foreword-tridge.xml index 760ef8e8268..3237b291a15 100644 --- a/docs/Samba-HOWTO-Collection/foreword-tridge.xml +++ b/docs/Samba-HOWTO-Collection/foreword-tridge.xml @@ -1,5 +1,5 @@ - + Foreword diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml index 94ed8df46e2..05fffd04577 100644 --- a/docs/Samba-HOWTO-Collection/glossary.xml +++ b/docs/Samba-HOWTO-Collection/glossary.xml @@ -1,5 +1,5 @@ - + Glossary diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml index f6a729ccea7..abf87479686 100644 --- a/docs/Samba-HOWTO-Collection/locking.xml +++ b/docs/Samba-HOWTO-Collection/locking.xml @@ -988,15 +988,17 @@ so far: locking.tdb Error Messages - - We are seeing lots of errors in the Samba logs, like: + + We are seeing lots of errors in the Samba logs, like: + tdb(/usr/local/samba_2.2.7/var/locks/locking.tdb): rec_read bad magic 0x4d6f4b61 at offset=36116 - What do these mean? - + + What do these mean? + diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 39e9e0a16bc..cd0b9a0daa7 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -317,12 +317,6 @@ - - - - - - diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl index fed7325c9b6..6a52902dcab 100644 --- a/docs/xslt/generate-attributions.xsl +++ b/docs/xslt/generate-attributions.xsl @@ -6,7 +6,7 @@ - + -- 2.11.4.GIT