Refresh for 3.0.25b

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1465 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 46 insertions, 46 deletions

diff --git a/patches/documentation.patch b/patches/documentation.patch
index 51111769db..48dca80b67 100644
--- a/patches/documentation.patch
+++ b/patches/documentation.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Some part should maybe go in the FHS patch
 
-Index: samba-3.0.25a/docs/manpages/swat.8
+Index: samba-3.0.25b/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/swat.8	2007-05-26 07:45:41.924233583 +0200
-+++ samba-3.0.25a/docs/manpages/swat.8	2007-05-26 07:46:28.136601722 +0200
+--- samba-3.0.25b.orig/docs/manpages/swat.8	2007-06-19 10:03:04.000000000 +0200
++++ samba-3.0.25b/docs/manpages/swat.8	2007-06-27 08:34:45.893162839 +0200
 @@ -111,60 +111,6 @@
  .RS 3n
  Print a summary of command line options.
@@ -19,18 +19,18 @@ Index: samba-3.0.25a/docs/manpages/swat.8
 -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
--\fBmake install \fR
+-make install
 -to install the
--\fBswat\fR
+-swat
 -binary and the various help files and images. A default install would put these in:
 -.TP 3n
--•
+-\(bu
 -/usr/local/samba/sbin/swat
 -.TP 3n
--•
+-\(bu
 -/usr/local/samba/swat/images/*
 -.TP 3n
--•
+-\(bu
 -/usr/local/samba/swat/help/*
 -.SS "Inetd Installation"
 -.PP
@@ -39,34 +39,34 @@ Index: samba-3.0.25a/docs/manpages/swat.8
 -and
 -\fI/etc/services\fR
 -to enable SWAT to be launched via
--\fBinetd\fR.
+-inetd.
 -.PP
 -In
 -\fI/etc/services\fR
 -you need to add a line like this:
 -.PP
--\fBswat 901/tcp\fR
+-swat 901/tcp
 -.PP
 -Note for NIS/YP and LDAP users - you may need to rebuild the NIS service maps rather than alter your local
 -\fI /etc/services\fR
 -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
--\fBinetd\fR
+-inetd
 -daemon).
 -.PP
 -In
 -\fI/etc/inetd.conf\fR
 -you should add a line like this:
 -.PP
--\fBswat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat\fR
+-swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat
 -.PP
 -Once you have edited
 -\fI/etc/services\fR
 -and
 -\fI/etc/inetd.conf\fR
 -you need to send a HUP signal to inetd. To do this use
--\fBkill -1 PID \fR
+-kill -1 PID
 -where PID is the process ID of the inetd daemon.
  .SH "LAUNCHING"
  .PP
@@ -88,10 +88,10 @@ Index: samba-3.0.25a/docs/manpages/swat.8
  .RE
  .SH "WARNINGS"
  .PP
-Index: samba-3.0.25a/docs/manpages/nmbd.8
+Index: samba-3.0.25b/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/nmbd.8	2007-05-26 07:45:41.932233647 +0200
-+++ samba-3.0.25a/docs/manpages/nmbd.8	2007-05-26 07:46:28.136601722 +0200
+--- samba-3.0.25b.orig/docs/manpages/nmbd.8	2007-06-19 10:02:10.000000000 +0200
++++ samba-3.0.25b/docs/manpages/nmbd.8	2007-06-27 08:35:53.389847479 +0200
 @@ -113,11 +113,9 @@
  to answer any name queries. Adding a line to this file affects name NetBIOS resolution from this host
  \fBONLY\fR.
@@ -108,7 +108,7 @@ Index: samba-3.0.25a/docs/manpages/nmbd.8
  man page for details on the contents of this file.
  .RE
 @@ -185,14 +183,11 @@
- \fBinetd\fR, 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).
+ inetd, 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
 -\fI/usr/local/samba/lib/smb.conf\fR
@@ -134,15 +134,15 @@ Index: samba-3.0.25a/docs/manpages/nmbd.8
 -directory configured under wherever Samba was configured to install itself). This will also cause
 +\fI/var/run/samba\fR
 +directory. This will also cause
- \fBnmbd\fR
+ nmbd
  to dump out its server database in the
  \fIlog.nmb\fR
-Index: samba-3.0.25a/docs/manpages/smbd.8
+Index: samba-3.0.25b/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/smbd.8	2007-05-26 07:45:41.948233774 +0200
-+++ samba-3.0.25a/docs/manpages/smbd.8	2007-05-26 07:46:28.172602009 +0200
+--- samba-3.0.25b.orig/docs/manpages/smbd.8	2007-06-19 10:02:38.000000000 +0200
++++ samba-3.0.25b/docs/manpages/smbd.8	2007-06-27 08:34:13.894734502 +0200
 @@ -168,14 +168,11 @@
- \fBinetd\fR, 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).
+ inetd, 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
 -\fI/usr/local/samba/lib/smb.conf\fR
@@ -158,10 +158,10 @@ Index: samba-3.0.25a/docs/manpages/smbd.8
  .sp
  This file describes all the services the server is to make available to clients. See
  \fBsmb.conf\fR(5)
-Index: samba-3.0.25a/docs/manpages/lmhosts.5
+Index: samba-3.0.25b/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/lmhosts.5	2007-05-26 07:45:41.956233838 +0200
-+++ samba-3.0.25a/docs/manpages/lmhosts.5	2007-05-26 07:46:28.204602264 +0200
+--- samba-3.0.25b.orig/docs/manpages/lmhosts.5	2007-06-19 10:02:02.000000000 +0200
++++ samba-3.0.25b/docs/manpages/lmhosts.5	2007-06-27 08:34:14.394709945 +0200
 @@ -77,10 +77,8 @@
  file.
  .SH "FILES"
@@ -175,10 +175,10 @@ Index: samba-3.0.25a/docs/manpages/lmhosts.5
  .SH "VERSION"
  .PP
  This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25a/docs/manpages/ntlm_auth.1
+Index: samba-3.0.25b/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/ntlm_auth.1	2007-05-26 07:45:41.968233934 +0200
-+++ samba-3.0.25a/docs/manpages/ntlm_auth.1	2007-05-26 07:46:28.244602583 +0200
+--- samba-3.0.25b.orig/docs/manpages/ntlm_auth.1	2007-06-19 10:02:14.000000000 +0200
++++ samba-3.0.25b/docs/manpages/ntlm_auth.1	2007-06-27 08:34:14.394709945 +0200
 @@ -43,7 +43,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -195,7 +195,7 @@ Index: samba-3.0.25a/docs/manpages/ntlm_auth.1
 -\fI$LOCKDIR\fR. The protocol used is described here:
 +\fI/var/run/samba\fR. 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
- \fBYR\fR
+ YR
  command. (Thus avoiding loss of information in the protocol exchange).
 @@ -94,7 +94,7 @@
  Requires access to the directory
@@ -206,46 +206,46 @@ Index: samba-3.0.25a/docs/manpages/ntlm_auth.1
  .RE
  .PP
  gss-spnego-client
-Index: samba-3.0.25a/docs/manpages/tdbbackup.8
+Index: samba-3.0.25b/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/tdbbackup.8	2007-05-26 07:45:41.976233997 +0200
-+++ samba-3.0.25a/docs/manpages/tdbbackup.8	2007-05-26 07:46:28.276602838 +0200
+--- samba-3.0.25b.orig/docs/manpages/tdbbackup.8	2007-06-19 10:03:06.000000000 +0200
++++ samba-3.0.25b/docs/manpages/tdbbackup.8	2007-06-27 08:37:03.886384577 +0200
 @@ -70,17 +70,17 @@
- •
+ \(bu
  
- \fBsecrets.tdb\fR
+ secrets.tdb
 -- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba.
 +- in the /var/lib/samba directory.
  .TP 3n
- •
+ \(bu
  
- \fBpassdb.tdb\fR
+ passdb.tdb
 -- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba.
 +- in the /var/lib/samba directory.
  .TP 3n
- •
+ \(bu
  
- \fB*.tdb\fR
+ *.tdb
 -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.0 of the Samba suite.
-Index: samba-3.0.25a/docs/manpages/winbindd.8
+Index: samba-3.0.25b/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/winbindd.8	2007-05-26 07:45:42.008234252 +0200
-+++ samba-3.0.25a/docs/manpages/winbindd.8	2007-05-26 07:46:28.316603157 +0200
-@@ -436,16 +436,16 @@
+--- samba-3.0.25b.orig/docs/manpages/winbindd.8	2007-06-19 10:03:56.000000000 +0200
++++ samba-3.0.25b/docs/manpages/winbindd.8	2007-06-27 08:38:55.880882830 +0200
+@@ -440,16 +440,16 @@
  file are owned by root.
  .RE
  .PP
 -$LOCKDIR/winbindd_privileged/pipe
-+$/var/run/samba/winbindd_privileged/pipe
++/var/run/samba/winbindd_privileged/pipe
  .RS 3n
  The UNIX pipe over which 'privileged' clients communicate with the
- \fBwinbindd\fR
+ winbindd
  program. For security reasons, access to some winbindd functions - like those needed by the
- \fBntlm_auth\fR
+ ntlm_auth
 -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
 -\fI$LOCKDIR/winbindd_privileged\fR
 +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
@@ -256,7 +256,7 @@ Index: samba-3.0.25a/docs/manpages/winbindd.8
  file are owned by root.
  .RE
  .PP
-@@ -454,15 +454,12 @@
+@@ -458,15 +458,12 @@
  Implementation of name service switch library.
  .RE
  .PP