From 218cb945032d2aee21948fe5e6e4418ba648f82d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 28 Jan 2003 13:52:38 +0000 Subject: First step in converting to XML: use strict syntax (This used to be commit 89f9a0a0c451a627b70c8373431e691ab964c1ef) --- docs/docbook/projdoc/ADS-HOWTO.sgml | 11 +++++---- docs/docbook/projdoc/Browsing-Quickguide.sgml | 16 ++++++------- docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml | 1 + docs/docbook/projdoc/Integrating-with-Windows.sgml | 18 +++++++-------- docs/docbook/projdoc/Samba-PDC-HOWTO.sgml | 26 +++++++++++----------- docs/docbook/projdoc/msdfs_setup.sgml | 2 +- docs/docbook/projdoc/printer_driver2.sgml | 6 ++--- docs/docbook/projdoc/winbind.sgml | 14 +++++++----- 8 files changed, 50 insertions(+), 44 deletions(-) (limited to 'docs/docbook/projdoc') diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.sgml index 3e34d53c0a..abe3f24fd5 100644 --- a/docs/docbook/projdoc/ADS-HOWTO.sgml +++ b/docs/docbook/projdoc/ADS-HOWTO.sgml @@ -14,7 +14,8 @@ This is a rough guide to setting up Samba 3.0 with kerberos authentication again Windows2000 KDC. -Pieces you need before you begin: +Pieces you need before you begin: + a Windows 2000 server. samba 3.0 or higher. @@ -26,7 +27,8 @@ Windows2000 KDC. Installing the required packages for Debian -On Debian you need to install the following packages: +On Debian you need to install the following packages: + libkrb5-dev krb5-user @@ -37,7 +39,8 @@ Windows2000 KDC. Installing the required packages for RedHat -On RedHat this means you should have at least: +On RedHat this means you should have at least: + krb5-workstation (for kinit) krb5-libs (for linking with) @@ -99,7 +102,7 @@ In case samba can't figure out your ads server using your realm name, use the The minimal configuration for krb5.conf is: - [realms] +[realms] YOUR.KERBEROS.REALM = { kdc = your.kerberos.server } diff --git a/docs/docbook/projdoc/Browsing-Quickguide.sgml b/docs/docbook/projdoc/Browsing-Quickguide.sgml index 8ecc795966..8e3fbce6d3 100644 --- a/docs/docbook/projdoc/Browsing-Quickguide.sgml +++ b/docs/docbook/projdoc/Browsing-Quickguide.sgml @@ -126,8 +126,9 @@ simultaneously the LMB on it's network segment. The syntax of the "remote browse sync" parameter is: + - remote browse sync = a.b.c.d +remote browse sync = a.b.c.d where a.b.c.d is either the IP address of the remote LMB or else is the network broadcast address of the remote segment. @@ -243,36 +244,35 @@ The safest rule of all to follow it this - USE ONLY ONE PROTOCOL! Resolution of NetBIOS names to IP addresses can take place using a number of methods. The only ones that can provide NetBIOS name_type information -are: +are: + WINS: the best tool! LMHOSTS: is static and hard to maintain. Broadcast: uses UDP and can not resolve names across remote segments. - -Alternative means of name resolution includes: +Alternative means of name resolution includes: /etc/hosts: is static, hard to maintain, and lacks name_type info DNS: is a good choice but lacks essential name_type info. - Many sites want to restrict DNS lookups and want to 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 order = wins lmhosts bcast host +name resolve order = wins lmhosts bcast host _or_ - name resolve order = wins lmhosts (eliminates bcast and host) +name resolve order = wins lmhosts (eliminates bcast and host) The default is: - name resolve order = host lmhost wins bcast +name resolve order = host lmhost wins bcast . where "host" refers the the native methods used by the Unix system to implement the gethostbyname() function call. This is normally diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml index 6d5a019fcb..06c1d3a87e 100644 --- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml +++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml @@ -1,3 +1,4 @@ + diff --git a/docs/docbook/projdoc/Integrating-with-Windows.sgml b/docs/docbook/projdoc/Integrating-with-Windows.sgml index 3b0faf81af..a4e79fd42b 100644 --- a/docs/docbook/projdoc/Integrating-with-Windows.sgml +++ b/docs/docbook/projdoc/Integrating-with-Windows.sgml @@ -295,16 +295,16 @@ The following are typical NetBIOS name/service type registrations: Unique NetBIOS Names: - MACHINENAME<00> = Server Service is running on MACHINENAME - MACHINENAME<03> = Generic Machine Name (NetBIOS name) - MACHINENAME<20> = LanMan Server service is running on MACHINENAME - WORKGROUP<1b> = Domain Master Browser + MACHINENAME<00> = Server Service is running on MACHINENAME + MACHINENAME<03> = Generic Machine Name (NetBIOS name) + MACHINENAME<20> = LanMan Server service is running on MACHINENAME + WORKGROUP<1b> = Domain Master Browser Group Names: - WORKGROUP<03> = Generic Name registered by all members of WORKGROUP - WORKGROUP<1c> = Domain Controllers / Netlogon Servers - WORKGROUP<1d> = Local Master Browsers - WORKGROUP<1e> = Internet Name Resolvers + WORKGROUP<03> = Generic Name registered by all members of WORKGROUP + WORKGROUP<1c> = Domain Controllers / Netlogon Servers + WORKGROUP<1d> = Local Master Browsers + WORKGROUP<1e> = Internet Name Resolvers @@ -323,7 +323,7 @@ be needed. An example of this is what happens when an MS Windows client wants to locate a domain logon server. It find this service and the IP address of a server that provides it by performing a lookup (via a NetBIOS broadcast) for enumeration of all machines that have -registered the name type *<1c>. A logon request is then sent to each +registered the name type *<1c>. A logon request is then sent to each IP address that is returned in the enumerated list of IP addresses. Which ever machine first replies then ends up providing the logon services. diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml index 7cf3e5735c..e6d6573924 100644 --- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml +++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml @@ -142,7 +142,7 @@ Implementing a Samba PDC can basically be divided into 2 broad steps. - + Configuring the Samba PDC @@ -426,7 +426,7 @@ be created manually. [global] - # <...remainder of parameters...> + # <...remainder of parameters...> add user script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u @@ -496,7 +496,7 @@ version of Windows. - A 'machine name' in (typically) /etc/passwd + A 'machine name' in (typically) /etc/passwd of the machine name with a '$' appended. FreeBSD (and other BSD systems?) won't create a user with a '$' in their name. @@ -504,7 +504,7 @@ version of Windows. The problem is only in the program used to make the entry, once made, it works perfectly. So create a user without the '$' and - use vipw to edit the entry, adding the '$'. Or create + use vipw to edit the entry, adding the '$'. Or create the whole entry with vipw if you like, make sure you use a unique User ID ! @@ -673,8 +673,8 @@ Here are some additional details: Policy Editor can be installed on an NT Workstation/Server, it will not work with NT policies because the registry key that are set by the policy templates. However, the files from the NT Server will run happily enough on an NTws. - You need poledit.exe, common.adm and winnt.adm. It is convenient - to put the two *.adm files in c:\winnt\inf which is where + You need poledit.exe, common.adm and winnt.adm. It is convenient + to put the two *.adm files in c:\winnt\inf which is where the binary will look for them unless told otherwise. Note also that that directory is 'hidden'. @@ -928,7 +928,7 @@ general SMB topics such as browsing. See how Scott Merrill simulates a BDC behavior at - http://www.skippy.net/linux/smb-howto.html. + http://www.skippy.net/linux/smb-howto.html. Although 2.0.7 has almost had its day as a PDC, David Bannon will keep the 2.0.7 PDC pages at @@ -958,8 +958,8 @@ general SMB topics such as browsing. There are a number of Samba related mailing lists. Go to http://samba.org, click on your nearest mirror - and then click on Support and then click on - Samba related mailing lists. + and then click on Support and then click on + Samba related mailing lists. @@ -1028,8 +1028,8 @@ general SMB topics such as browsing. To have your name removed from a samba mailing list, go to the same place you went to to get on it. Go to http://lists.samba.org, - click on your nearest mirror and then click on Support and - then click on Samba related mailing lists. Or perhaps see + click on your nearest mirror and then click on Support and + then click on Samba related mailing lists. Or perhaps see here @@ -1112,7 +1112,7 @@ worthwhile lookingat how a Windows 9x/ME client performs a logon: The client broadcasts (to the IP broadcast address of the subnet it is in) - a NetLogon request. This is sent to the NetBIOS name DOMAIN<1c> at the + a NetLogon request. This is sent to the NetBIOS name DOMAIN<1c> at the NetBIOS layer. The client chooses the first response it receives, which contains the NetBIOS name of the logon server to use in the format of \\SERVER. @@ -1704,7 +1704,7 @@ contrast to w95, where it _does_ transfer / update profiles correctly]. -DOMAIN_CONTROL.txt : Windows NT Domain Control & Samba +DOMAIN_CONTROL.txt : Windows NT Domain Control & Samba diff --git a/docs/docbook/projdoc/msdfs_setup.sgml b/docs/docbook/projdoc/msdfs_setup.sgml index 6e1609460f..a86cd74235 100644 --- a/docs/docbook/projdoc/msdfs_setup.sgml +++ b/docs/docbook/projdoc/msdfs_setup.sgml @@ -4,7 +4,7 @@ ShirishKalele - Samba Team & Veritas Software + Samba Team & Veritas Software
samba@samba.org
diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.sgml index 7bca8dc6f5..8d15e437b2 100644 --- a/docs/docbook/projdoc/printer_driver2.sgml +++ b/docs/docbook/projdoc/printer_driver2.sgml @@ -409,8 +409,8 @@ echo " :sd=/var/spool/lpd/$2:\\" >> $PRINTCAP echo " :mx=0:ml=0:sh:\\" >> $PRINTCAP echo " :lp=/usr/local/samba/var/print/$5.prn:" >> $PRINTCAP -touch "/usr/local/samba/var/print/$5.prn" >> /tmp/printadd.$$ 2>&1 -chown $LP "/usr/local/samba/var/print/$5.prn" >> /tmp/printadd.$$ 2>&1 +touch "/usr/local/samba/var/print/$5.prn" >> /tmp/printadd.$$ 2>&1 +chown $LP "/usr/local/samba/var/print/$5.prn" >> /tmp/printadd.$$ 2>&1 mkdir /var/spool/lpd/$2 chmod 700 /var/spool/lpd/$2 @@ -757,7 +757,7 @@ be: /usr/bin/id -p >/tmp/tmp.print # we run the command and save the error messages # replace the command with the one appropriate for your system - /usr/bin/lpr -r -P$1 $2 2>>&/tmp/tmp.print + /usr/bin/lpr -r -P$1 $2 2>>&/tmp/tmp.print diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml index d2bfb8ab67..b144c5e06b 100644 --- a/docs/docbook/projdoc/winbind.sgml +++ b/docs/docbook/projdoc/winbind.sgml @@ -2,6 +2,7 @@ + TimPotter @@ -10,7 +11,7 @@ - AndrewTrigdell + AndrewTridgell Samba Team
tridge@linuxcare.com.au
@@ -35,6 +36,7 @@
jelmer@nl.linux.org
 + 27 June 2002 @@ -552,7 +554,7 @@ include the following entries in the [global] section: [global] - <...> + <...> # separate domain and username with '+', like DOMAIN+username winbind separator = + # use uids from 10000 to 20000 for domain users @@ -733,7 +735,7 @@ start() { daemon /usr/local/samba/bin/winbindd RETVAL3=$? echo - [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 -a $RETVAL3 -eq 0 ] && touch /var/lock/subsys/smb || \ + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 -a $RETVAL3 -eq 0 ] && touch /var/lock/subsys/smb || \ RETVAL=1 return $RETVAL } @@ -760,7 +762,7 @@ stop() { echo -n $"Shutting down $KIND services: " killproc winbindd RETVAL3=$? - [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 -a $RETVAL3 -eq 0 ] && rm -f /var/lock/subsys/smb + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 -a $RETVAL3 -eq 0 ] && rm -f /var/lock/subsys/smb echo "" return $RETVAL } @@ -791,7 +793,7 @@ killproc() { # kill the named process(es) pid=`/usr/bin/ps -e | /usr/bin/grep -w $1 | /usr/bin/sed -e 's/^ *//' -e 's/ .*//'` - [ "$pid" != "" ] && kill $pid + [ "$pid" != "" ] && kill $pid } # Start/stop processes required for samba server @@ -1042,7 +1044,7 @@ annoying double prompts for passwords. -Now restart your Samba & try connecting through your application that you +Now restart your Samba and try connecting through your application that you configured in the pam.conf. -- cgit