Description: Remove documentation parts that do not apply to Debian Author: Christian Perrier Forwarded: not-needed Index: experimental/docs/manpages/swat.8 =================================================================== --- experimental.orig/docs/manpages/swat.8 +++ experimental/docs/manpages/swat.8 @@ -261,85 +261,6 @@ .RS 4 Print a summary of command line options\&. .RE -.SH "INSTALLATION" -.PP -Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&. -.PP -After you compile SWAT you need to run -\FCmake install \F[] -to install the -\FCswat\F[] -binary and the various help files and images\&. A default install would put these in: -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -/usr/local/samba/sbin/swat -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -/usr/local/samba/swat/images/* -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -/usr/local/samba/swat/help/* -.sp -.RE -.SS "Inetd Installation" -.PP -You need to edit your -\FC/etc/inetd\&.conf \F[] -and -\FC/etc/services\F[] -to enable SWAT to be launched via -\FCinetd\F[]\&. -.PP -In -\FC/etc/services\F[] -you need to add a line like this: -.PP -\FCswat 901/tcp\F[] -.PP -Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local -\FC /etc/services\F[] -file\&. -.PP -the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your -\FCinetd\F[] -daemon)\&. -.PP -In -\FC/etc/inetd\&.conf\F[] -you should add a line like this: -.PP -\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[] -.PP -Once you have edited -\FC/etc/services\F[] -and -\FC/etc/inetd\&.conf\F[] -you need to send a HUP signal to inetd\&. To do this use -\FCkill \-1 PID \F[] -where PID is the process ID of the inetd daemon\&. .SH "LAUNCHING" .PP To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&. @@ -357,14 +278,11 @@ This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&. .RE .PP -\FC/usr/local/samba/lib/smb\&.conf\F[] +\FC/etc/samba/smb\&.conf\F[] .RS 4 This is the default location of the \fBsmb.conf\fR(5) -server configuration file that swat edits\&. Other common places that systems install this file are -\FC /usr/samba/lib/smb\&.conf\F[] -and -\FC/etc/smb\&.conf \F[]\&. This file describes all the services the server is to make available to clients\&. +server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&. .RE .SH "WARNINGS" .PP Index: experimental/docs/manpages/nmbd.8 =================================================================== --- experimental.orig/docs/manpages/nmbd.8 +++ experimental/docs/manpages/nmbd.8 @@ -265,10 +265,7 @@ to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host \fIONLY\fR\&. .sp -The default path to this file is compiled into Samba as part of the build process\&. Common defaults are -\FC/usr/local/samba/lib/lmhosts\F[], -\FC/usr/samba/lib/lmhosts\F[] -or +The default path to this file is \FC/etc/samba/lmhosts\F[]\&. See the \fBlmhosts\fR(5) man page for details on the contents of this file\&. @@ -337,14 +334,11 @@ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&. .RE .PP -\FC/usr/local/samba/lib/smb\&.conf\F[] +\FC/etc/samba/smb\&.conf\F[] .RS 4 This is the default location of the \fBsmb.conf\fR(5) -server configuration file\&. Other common places that systems install this file are -\FC/usr/samba/lib/smb\&.conf\F[] -and -\FC/etc/samba/smb\&.conf\F[]\&. ++server configuration file\&. .sp When run as a WINS server (see the \m[blue]\fBwins support\fR\m[] @@ -388,10 +382,8 @@ will accept SIGHUP, which will cause it to dump out its namelists into the file \FCnamelist\&.debug \F[] in the -\FC/usr/local/samba/var/locks\F[] -directory (or the -\FCvar/locks\F[] -directory configured under wherever Samba was configured to install itself)\&. This will also cause +\FC/var/run/samba\F[] +directory\&. This will also cause \FCnmbd\F[] to dump out its server database in the \FClog\&.nmb\F[] Index: experimental/docs/manpages/smbd.8 =================================================================== --- experimental.orig/docs/manpages/smbd.8 +++ experimental/docs/manpages/smbd.8 @@ -319,14 +319,11 @@ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&. .RE .PP -\FC/usr/local/samba/lib/smb\&.conf\F[] +\FC/etc/samba/smb\&.conf\F[] .RS 4 This is the default location of the \fBsmb.conf\fR(5) -server configuration file\&. Other common places that systems install this file are -\FC/usr/samba/lib/smb\&.conf\F[] -and -\FC/etc/samba/smb\&.conf\F[]\&. ++server configuration file\&. .sp This file describes all the services the server is to make available to clients\&. See \fBsmb.conf\fR(5) Index: experimental/docs/manpages/lmhosts.5 =================================================================== --- experimental.orig/docs/manpages/lmhosts.5 +++ experimental/docs/manpages/lmhosts.5 @@ -257,10 +257,8 @@ file\&. .SH "FILES" .PP -lmhosts is loaded from the configuration directory\&. This is usually -\FC/etc/samba\F[] -or -\FC/usr/local/samba/lib\F[]\&. +lmhosts is loaded from the configuration directory\&. This is +\FC/etc/samba\F[]\&. .SH "VERSION" .PP This man page is correct for version 3 of the Samba suite\&. Index: experimental/docs/manpages/ntlm_auth.1 =================================================================== --- experimental.orig/docs/manpages/ntlm_auth.1 +++ experimental/docs/manpages/ntlm_auth.1 @@ -193,7 +193,7 @@ Some of these commands also require access to the directory \FCwinbindd_privileged\F[] in -\FC$LOCKDIR\F[]\&. This should be done either by running this command as root or providing group access to the +\FC/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the \FCwinbindd_privileged\F[] directory\&. For security reasons, this directory should not be world\-accessable\&. .SH "OPTIONS" @@ -219,7 +219,7 @@ Requires access to the directory \FCwinbindd_privileged\F[] in -\FC$LOCKDIR\F[]\&. The protocol used is described here: +\FC/var/run/samba\F[]\&. The protocol used is described here: http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the \FCYR\F[] command\&. (Thus avoiding loss of information in the protocol exchange)\&. @@ -242,7 +242,7 @@ Requires access to the directory \FCwinbindd_privileged\F[] in -\FC$LOCKDIR\F[]\&. +\FC/var/run/samba\F[]\&. .RE .PP gss\-spnego\-client Index: experimental/docs/manpages/tdbbackup.8 =================================================================== --- experimental.orig/docs/manpages/tdbbackup.8 +++ experimental/docs/manpages/tdbbackup.8 @@ -227,7 +227,7 @@ .\} \FCsecrets\&.tdb\F[] -\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&. +\- usual location is in the /var/lib/samba directory\&. .RE .sp .RS 4 @@ -240,7 +240,7 @@ .\} \FCpassdb\&.tdb\F[] -\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&. +\- usual location is in the /var/lib/samba directory\&. .RE .sp .RS 4 @@ -253,7 +253,7 @@ .\} \FC*\&.tdb\F[] -located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&. +located in the /var/lib/samba and /var/run/samba directories\&. .SH "VERSION" .PP This man page is correct for version 3 of the Samba suite\&. Index: experimental/docs/manpages/winbindd.8 =================================================================== --- experimental.orig/docs/manpages/winbindd.8 +++ experimental/docs/manpages/winbindd.8 @@ -771,16 +771,16 @@ file are owned by root\&. .RE .PP -$LOCKDIR/winbindd_privileged/pipe +/var/run/samba/winbindd_privileged/pipe .RS 4 The UNIX pipe over which \'privileged\' clients communicate with the \FCwinbindd\F[] program\&. For security reasons, access to some winbindd functions \- like those needed by the \FCntlm_auth\F[] -utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the -\FC$LOCKDIR/winbindd_privileged\F[] +utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the +\FC/var/run/samba/winbindd_privileged\F[] directory and -\FC$LOCKDIR/winbindd_privileged/pipe\F[] +\FC/var/run/samba/winbindd_privileged/pipe\F[] file are owned by root\&. .RE .PP @@ -789,15 +789,12 @@ Implementation of name service switch library\&. .RE .PP -$LOCKDIR/winbindd_idmap\&.tdb +/var/run/samba/winbindd_idmap\&.tdb .RS 4 -Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the -\fI\-\-with\-lockdir\fR -option\&. This directory is by default -\FC/usr/local/samba/var/locks \F[]\&. +Storage for the Windows NT rid to UNIX user/group id mapping\&. .RE .PP -$LOCKDIR/winbindd_cache\&.tdb +/var/run/samba/winbindd_cache\&.tdb .RS 4 Storage for cached user and group information\&. .RE