[Pkg-samba-maint] r1887 - in trunk/samba/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Thu May 22 12:11:02 UTC 2008
Author: bubulle
Date: 2008-05-22 12:11:01 +0000 (Thu, 22 May 2008)
New Revision: 1887
Removed:
trunk/samba/debian/patches/manpage-encoding.patch
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/README_nosmbldap-tools.patch
trunk/samba/debian/patches/VERSION.patch
trunk/samba/debian/patches/adapt_machine_creation_script.patch
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/disable-weak-auth.patch
trunk/samba/debian/patches/documentation.patch
trunk/samba/debian/patches/fhs-assignpaths.patch
trunk/samba/debian/patches/fhs-filespaths.patch
trunk/samba/debian/patches/fhs-newpaths.patch
trunk/samba/debian/patches/installswat.sh.patch
trunk/samba/debian/patches/non-linux-ports.patch
trunk/samba/debian/patches/pam-examples.patch
trunk/samba/debian/patches/series
trunk/samba/debian/patches/smbclient-pager.patch
trunk/samba/debian/patches/smbpasswd-syslog.patch
trunk/samba/debian/patches/smbstatus-locking.patch
trunk/samba/debian/patches/undefined-symbols.patch
trunk/samba/debian/patches/usershare.patch
Log:
Adapt patches for 3.0.29
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/changelog 2008-05-22 12:11:01 UTC (rev 1887)
@@ -1,3 +1,9 @@
+samba (1:3.0.29-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Christian Perrier <bubulle at debian.org> Thu, 22 May 2008 07:31:55 +0200
+
samba (1:3.0.28a-3) unstable; urgency=low
* The "bug hunting at SambaXP" release
Modified: trunk/samba/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/samba/debian/patches/README_nosmbldap-tools.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/README_nosmbldap-tools.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.28a/examples/LDAP/README
+Index: samba-3.0.29/examples/LDAP/README
===================================================================
---- samba-3.0.28a.orig/examples/LDAP/README
-+++ samba-3.0.28a/examples/LDAP/README
+--- samba-3.0.29.orig/examples/LDAP/README
++++ samba-3.0.29/examples/LDAP/README
@@ -59,6 +59,9 @@
The smbldap-tools package can be downloaded individually from
http://samba.idealx.org/dist/
Modified: trunk/samba/debian/patches/VERSION.patch
===================================================================
--- trunk/samba/debian/patches/VERSION.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/VERSION.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -6,10 +6,10 @@
Note: Should be kept
-Index: samba-3.0.28a/source/VERSION
+Index: samba-3.0.29/source/VERSION
===================================================================
---- samba-3.0.28a.orig/source/VERSION
-+++ samba-3.0.28a/source/VERSION
+--- samba-3.0.29.orig/source/VERSION
++++ samba-3.0.29/source/VERSION
@@ -95,5 +95,5 @@
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
Modified: trunk/samba/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/samba/debian/patches/adapt_machine_creation_script.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/adapt_machine_creation_script.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -6,18 +6,18 @@
Note:
-Index: samba-3.0.28a/docs/manpages/smb.conf.5
+Index: samba-3.0.29/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.28a.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.28a/docs/manpages/smb.conf.5
-@@ -662,8 +662,8 @@
+--- samba-3.0.29.orig/docs/manpages/smb.conf.5
++++ samba-3.0.29/docs/manpages/smb.conf.5
+@@ -693,8 +693,8 @@
Default:
- \fB\fIadd machine script\fR = \fR
+ \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
.sp
-Example:
--\fB\fIadd machine script\fR = /usr/sbin/adduser -n -g machines -c Machine -d /var/lib/nobody -s /bin/false %u \fR
+-\fI\fIadd machine script\fR\fR\fI = \fR\fI/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\fR\fI \fR
+Example for Debian:
+\fB\fIadd machine script\fR = /usr/sbin/adduser -n -g machines -c Machine -d /var/lib/samba -s /bin/false %u \fR
.RE
- .PP
+
add port command (G)
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/autoconf.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -25,10 +25,10 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-3.0.28a/source/configure
+Index: samba-3.0.29/source/configure
===================================================================
---- samba-3.0.28a.orig/source/configure
-+++ samba-3.0.28a/source/configure
+--- samba-3.0.29.orig/source/configure
++++ samba-3.0.29/source/configure
@@ -671,6 +671,9 @@
logfilebase
privatedir
@@ -39,7 +39,7 @@
rootsbindir
pammodulesdir
SAMBA_CPPFLAGS
-@@ -2150,7 +2153,7 @@
+@@ -2151,7 +2154,7 @@
if test "${with_fhs+set}" = set; then
withval=$with_fhs; case "$withval" in
yes)
@@ -48,7 +48,7 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -2158,6 +2161,14 @@
+@@ -2159,6 +2162,14 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
@@ -63,7 +63,7 @@
;;
esac
fi
-@@ -2461,6 +2472,9 @@
+@@ -2462,6 +2473,9 @@
@@ -73,7 +73,7 @@
## check for --enable-debug first before checking CFLAGS before
## so that we don't mix -O and -g
# Check whether --enable-debug was given.
-@@ -11615,6 +11629,27 @@
+@@ -11616,6 +11630,27 @@
fi
;;
@@ -101,7 +101,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -34668,7 +34703,7 @@
+@@ -34669,7 +34704,7 @@
#
#
case "$host_os" in
@@ -110,7 +110,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -39576,11 +39611,14 @@
+@@ -39577,11 +39612,14 @@
# and these are for particular systems
case "$host_os" in
@@ -127,7 +127,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -62311,7 +62349,7 @@
+@@ -62312,7 +62350,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -136,7 +136,7 @@
{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -63333,11 +63371,11 @@
+@@ -63334,11 +63372,11 @@
SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
case "$host_os" in
@@ -150,7 +150,7 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-@@ -67892,6 +67930,9 @@
+@@ -67895,6 +67933,9 @@
logfilebase!$logfilebase$ac_delim
privatedir!$privatedir$ac_delim
swatdir!$swatdir$ac_delim
@@ -160,7 +160,7 @@
rootsbindir!$rootsbindir$ac_delim
pammodulesdir!$pammodulesdir$ac_delim
SAMBA_CPPFLAGS!$SAMBA_CPPFLAGS$ac_delim
-@@ -67929,9 +67970,6 @@
+@@ -67932,9 +67973,6 @@
PASSDB_LIBS!$PASSDB_LIBS$ac_delim
IDMAP_LIBS!$IDMAP_LIBS$ac_delim
KRB5_LIBS!$KRB5_LIBS$ac_delim
@@ -170,7 +170,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67973,6 +68011,9 @@
+@@ -67976,6 +68014,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -180,19 +180,19 @@
INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -68056,7 +68097,7 @@
+@@ -68060,7 +68101,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.0.28a/source/include/config.h.in
+Index: samba-3.0.29/source/include/config.h.in
===================================================================
---- samba-3.0.28a.orig/source/include/config.h.in
-+++ samba-3.0.28a/source/include/config.h.in
+--- samba-3.0.29.orig/source/include/config.h.in
++++ samba-3.0.29/source/include/config.h.in
@@ -57,6 +57,9 @@
/* Define to turn on dmalloc debugging */
#undef ENABLE_DMALLOC
Modified: trunk/samba/debian/patches/disable-weak-auth.patch
===================================================================
--- trunk/samba/debian/patches/disable-weak-auth.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/disable-weak-auth.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -7,10 +7,10 @@
Upstream status: pulled from upstream 3.2 git tree, will be superseded
with first release of 3.2
-Index: samba-3.0.28a/source/param/loadparm.c
+Index: samba-3.0.29/source/param/loadparm.c
===================================================================
---- samba-3.0.28a.orig/source/param/loadparm.c
-+++ samba-3.0.28a/source/param/loadparm.c
+--- samba-3.0.29.orig/source/param/loadparm.c
++++ samba-3.0.29/source/param/loadparm.c
@@ -1572,9 +1572,9 @@
Globals.bStatCache = True; /* use stat cache by default */
Globals.iMaxStatCacheSize = 1024; /* one Meg by default. */
@@ -24,65 +24,65 @@
Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is available (otherwise NTLMv2) */
Globals.bClientNTLMv2Auth = False; /* Client should not use NTLMv2, as we can't tell that the server supports it. */
/* Note, that we will use NTLM2 session security (which is different), if it is available */
-Index: samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
+Index: samba-3.0.29/docs/htmldocs/manpages/smb.conf.5.html
===================================================================
---- samba-3.0.28a.orig/docs/htmldocs/manpages/smb.conf.5.html
-+++ samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
-@@ -780,7 +780,7 @@
+--- samba-3.0.29.orig/docs/htmldocs/manpages/smb.conf.5.html
++++ samba-3.0.29/docs/htmldocs/manpages/smb.conf.5.html
+@@ -871,7 +871,7 @@
without Windows 95/98 servers are advised to disable
this option. </p><p>Disabling this option will also disable the <code class="literal">client plaintext auth</code> option</p><p>Likewise, if the <code class="literal">client ntlmv2
auth</code> parameter is enabled, then only NTLMv2 logins will be
- attempted.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client lanman auth</code></em> = <code class="literal">yes</code>
+ attempted.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client lanman auth</code></em> = <code class="literal">no</code>
</em></span>
- </p></dd><dt><span class="term"><a name="CLIENTNTLMV2AUTH"></a>client ntlmv2 auth (G)</span></dt><dd><p>This parameter determines whether or not <a href="smbclient.8.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(8)</span></a> will attempt to
- authenticate itself to servers using the NTLMv2 encrypted password
-@@ -795,7 +795,7 @@
- responses, and not the weaker LM or NTLM.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client ntlmv2 auth</code></em> = <code class="literal">no</code>
- </em></span>
- </p></dd><dt><span class="term"><a name="CLIENTPLAINTEXTAUTH"></a>client plaintext auth (G)</span></dt><dd><p>Specifies whether a client should send a plaintext
+ </p></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id328533"></a>
+
+@@ -892,7 +892,7 @@
+
+ client plaintext auth (G)
+ </h3></div></div></div><a class="indexterm" name="id328614"></a><a name="CLIENTPLAINTEXTAUTH"></a><div class="variablelist"><dl><dt></dt><dd><p>Specifies whether a client should send a plaintext
- password if the server does not support encrypted passwords.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client plaintext auth</code></em> = <code class="literal">yes</code>
+ password if the server does not support encrypted passwords.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>client plaintext auth</code></em> = <code class="literal">no</code>
</em></span>
- </p></dd><dt><span class="term"><a name="CLIENTSCHANNEL"></a>client schannel (G)</span></dt><dd><p>
- This controls whether the client offers or even demands the use of the netlogon schannel.
-@@ -2007,7 +2007,7 @@
+ </p></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id328651"></a>
+
+@@ -2404,7 +2404,7 @@
auth</code> to disable this for Samba's clients (such as smbclient)</p><p>If this option, and <code class="literal">ntlm
auth</code> are both disabled, then only NTLMv2 logins will be
permited. Not all clients support NTLMv2, and most will require
- special configuration to use it.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>lanman auth</code></em> = <code class="literal">yes</code>
+ special configuration to use it.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>lanman auth</code></em> = <code class="literal">no</code>
</em></span>
- </p></dd><dt><span class="term"><a name="LARGEREADWRITE"></a>large readwrite (G)</span></dt><dd><p>This parameter determines whether or not
- <a href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a> supports the new 64k
-Index: samba-3.0.28a/docs/manpages/smb.conf.5
+ </p></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id335983"></a>
+
+Index: samba-3.0.29/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.28a.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.28a/docs/manpages/smb.conf.5
-@@ -1272,7 +1272,7 @@
- parameter is enabled, then only NTLMv2 logins will be attempted.
+--- samba-3.0.29.orig/docs/manpages/smb.conf.5
++++ samba-3.0.29/docs/manpages/smb.conf.5
+@@ -1491,7 +1491,7 @@
+ parameter is enabled, then only NTLMv2 logins will be attempted\.
.sp
Default:
--\fB\fIclient lanman auth\fR = yes \fR
-+\fB\fIclient lanman auth\fR = no \fR
+-\fI\fIclient lanman auth\fR\fR\fI = \fR\fIyes\fR\fI \fR
++\fI\fIclient lanman auth\fR\fR\fI = \fR\fIno\fR\fI \fR
.RE
- .PP
+
client ntlmv2 auth (G)
-@@ -1303,7 +1303,7 @@
- Specifies whether a client should send a plaintext password if the server does not support encrypted passwords.
+@@ -1524,7 +1524,7 @@
+ Specifies whether a client should send a plaintext password if the server does not support encrypted passwords\.
.sp
Default:
--\fB\fIclient plaintext auth\fR = yes \fR
-+\fB\fIclient plaintext auth\fR = no \fR
+-\fI\fIclient plaintext auth\fR\fR\fI = \fR\fIyes\fR\fI \fR
++\fI\fIclient plaintext auth\fR\fR\fI = \fR\fIno\fR\fI \fR
.RE
- .PP
+
client schannel (G)
-@@ -3082,7 +3082,7 @@
- are both disabled, then only NTLMv2 logins will be permited. Not all clients support NTLMv2, and most will require special configuration to use it.
+@@ -3624,7 +3624,7 @@
+ are both disabled, then only NTLMv2 logins will be permited\. Not all clients support NTLMv2, and most will require special configuration to use it\.
.sp
Default:
--\fB\fIlanman auth\fR = yes \fR
-+\fB\fIlanman auth\fR = no \fR
+-\fI\fIlanman auth\fR\fR\fI = \fR\fIyes\fR\fI \fR
++\fI\fIlanman auth\fR\fR\fI = \fR\fIno\fR\fI \fR
.RE
- .PP
+
large readwrite (G)
Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/documentation.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -6,40 +6,65 @@
Note: Some part should maybe go in the FHS patch
-Index: samba-3.0.28a/docs/manpages/swat.8
+Index: samba-3.0.29/docs/manpages/swat.8
===================================================================
---- samba-3.0.28a.orig/docs/manpages/swat.8
-+++ samba-3.0.28a/docs/manpages/swat.8
-@@ -111,60 +111,6 @@
- .RS 3n
- Print a summary of command line options.
+--- samba-3.0.29.orig/docs/manpages/swat.8
++++ samba-3.0.29/docs/manpages/swat.8
+@@ -103,85 +103,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.
+-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
-make install
-to install the
-swat
--binary and the various help files and images. A default install would put these in:
--.TP 3n
--\(bu
+-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
--.TP 3n
--\(bu
+-.RE
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
-/usr/local/samba/swat/images/*
--.TP 3n
--\(bu
+-.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
--\fI/etc/inetd.conf \fR
+-\fI/etc/inetd\.conf \fR
-and
-\fI/etc/services\fR
-to enable SWAT to be launched via
--inetd.
+-inetd\.
-.PP
-In
-\fI/etc/services\fR
@@ -47,231 +72,237 @@
-.PP
-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
+-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.
+-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
+-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
-inetd
--daemon).
+-daemon)\.
-.PP
-In
--\fI/etc/inetd.conf\fR
+-\fI/etc/inetd\.conf\fR
-you should add a line like this:
-.PP
--swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat
+-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
--kill -1 PID
--where PID is the process ID of the inetd daemon.
+-\fI/etc/inetd\.conf\fR
+-you need to send a HUP signal to inetd\. To do this use
+-kill \-1 PID
+-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/".
-@@ -182,14 +128,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).
+ To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\.
+@@ -199,14 +120,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
--\fI/usr/local/samba/lib/smb.conf\fR
-+\fI/etc/samba/smb.conf\fR
- .RS 3n
+-\fI/usr/local/samba/lib/smb\.conf\fR
++\fI/etc/samba/smb\.conf\fR
+ .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
--\fI /usr/samba/lib/smb.conf\fR
+-server configuration file that swat edits\. Other common places that systems install this file are
+-\fI /usr/samba/lib/smb\.conf\fR
-and
--\fI/etc/smb.conf \fR. This file describes all the services the server is to make available to clients.
+-\fI/etc/smb\.conf \fR\. 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: samba-3.0.28a/docs/manpages/nmbd.8
+Index: samba-3.0.29/docs/manpages/nmbd.8
===================================================================
---- samba-3.0.28a.orig/docs/manpages/nmbd.8
-+++ samba-3.0.28a/docs/manpages/nmbd.8
-@@ -113,11 +113,9 @@
- to answer any name queries. Adding a line to this file affects name NetBIOS resolution from this host
- \fBONLY\fR.
+--- samba-3.0.29.orig/docs/manpages/nmbd.8
++++ samba-3.0.29/docs/manpages/nmbd.8
+@@ -107,11 +107,9 @@
+ 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
+-The default path to this file is compiled into Samba as part of the build process\. Common defaults are
-\fI/usr/local/samba/lib/lmhosts\fR,
-\fI/usr/samba/lib/lmhosts\fR
-or
--\fI/etc/samba/lmhosts\fR. See the
+-\fI/etc/samba/lmhosts\fR\. See the
+The default path to this file is
+\fI/etc/samba/lmhosts\fR.
+See the
\fBlmhosts\fR(5)
- man page for details on the contents of this file.
+ man page for details on the contents of this file\.
.RE
-@@ -185,14 +183,11 @@
- 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).
+@@ -179,14 +177,11 @@
+ 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
-+\fI/etc/samba/smb.conf\fR
- .RS 3n
+-\fI/usr/local/samba/lib/smb\.conf\fR
++\fI/etc/samba/smb\.conf\fR
+ .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
--\fI/usr/samba/lib/smb.conf\fR
+-server configuration file\. Other common places that systems install this file are
+-\fI/usr/samba/lib/smb\.conf\fR
-and
--\fI/etc/samba/smb.conf\fR.
+-\fI/etc/samba/smb\.conf\fR\.
+server configuration file.
.sp
When run as a WINS server (see the
- wins support parameter in the
-@@ -234,10 +229,8 @@
+ \fIwins support\fR
+@@ -230,10 +225,8 @@
will accept SIGHUP, which will cause it to dump out its namelists into the file
- \fInamelist.debug \fR
+ \fInamelist\.debug \fR
in the
-\fI/usr/local/samba/var/locks\fR
-directory (or the
-\fIvar/locks\fR
--directory configured under wherever Samba was configured to install itself). This will also cause
+-directory configured under wherever Samba was configured to install itself)\. This will also cause
+\fI/var/run/samba\fR
+directory. This will also cause
nmbd
to dump out its server database in the
- \fIlog.nmb\fR
-Index: samba-3.0.28a/docs/manpages/smbd.8
+ \fIlog\.nmb\fR
+Index: samba-3.0.29/docs/manpages/smbd.8
===================================================================
---- samba-3.0.28a.orig/docs/manpages/smbd.8
-+++ samba-3.0.28a/docs/manpages/smbd.8
-@@ -168,14 +168,11 @@
- 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).
+--- samba-3.0.29.orig/docs/manpages/smbd.8
++++ samba-3.0.29/docs/manpages/smbd.8
+@@ -161,14 +161,11 @@
+ 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
-+\fI/etc/samba/smb.conf\fR
- .RS 3n
+-\fI/usr/local/samba/lib/smb\.conf\fR
++\fI/etc/samba/smb\.conf\fR
+ .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
--\fI/usr/samba/lib/smb.conf\fR
+-server configuration file\. Other common places that systems install this file are
+-\fI/usr/samba/lib/smb\.conf\fR
-and
--\fI/etc/samba/smb.conf\fR.
+-\fI/etc/samba/smb\.conf\fR\.
+server configuration file.
.sp
- This file describes all the services the server is to make available to clients. See
+ This file describes all the services the server is to make available to clients\. See
\fBsmb.conf\fR(5)
-Index: samba-3.0.28a/docs/manpages/lmhosts.5
+Index: samba-3.0.29/docs/manpages/lmhosts.5
===================================================================
---- samba-3.0.28a.orig/docs/manpages/lmhosts.5
-+++ samba-3.0.28a/docs/manpages/lmhosts.5
-@@ -77,10 +77,8 @@
- file.
+--- samba-3.0.29.orig/docs/manpages/lmhosts.5
++++ samba-3.0.29/docs/manpages/lmhosts.5
+@@ -83,10 +83,8 @@
+ file\.
.SH "FILES"
.PP
--lmhosts is loaded from the configuration directory. This is usually
+-lmhosts is loaded from the configuration directory\. This is usually
-\fI/etc/samba\fR
-or
--\fI/usr/local/samba/lib\fR.
+-\fI/usr/local/samba/lib\fR\.
+lmhosts is loaded from the configuration directory. This is
+\fI/etc/samba\fR.
.SH "VERSION"
.PP
- This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.28a/docs/manpages/ntlm_auth.1
+ This man page is correct for version 3\.0 of the Samba suite\.
+Index: samba-3.0.29/docs/manpages/ntlm_auth.1
===================================================================
---- samba-3.0.28a.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.0.28a/docs/manpages/ntlm_auth.1
-@@ -43,7 +43,7 @@
+--- samba-3.0.29.orig/docs/manpages/ntlm_auth.1
++++ samba-3.0.29/docs/manpages/ntlm_auth.1
+@@ -35,7 +35,7 @@
Some of these commands also require access to the directory
\fIwinbindd_privileged\fR
in
--\fI$LOCKDIR\fR. This should be done either by running this command as root or providing group access to the
+-\fI$LOCKDIR\fR\. This should be done either by running this command as root or providing group access to the
+\fI/var/run/samba\fR. This should be done either by running this command as root or providing group access to the
\fIwinbindd_privileged\fR
- directory. For security reasons, this directory should not be world-accessable.
+ directory\. For security reasons, this directory should not be world\-accessable\.
.SH "OPTIONS"
-@@ -71,7 +71,7 @@
+@@ -61,7 +61,7 @@
Requires access to the directory
\fIwinbindd_privileged\fR
in
--\fI$LOCKDIR\fR. The protocol used is described here:
+-\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
+ 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
YR
- command. (Thus avoiding loss of information in the protocol exchange).
-@@ -94,7 +94,7 @@
+ command\. (Thus avoiding loss of information in the protocol exchange)\.
+@@ -84,7 +84,7 @@
Requires access to the directory
\fIwinbindd_privileged\fR
in
--\fI$LOCKDIR\fR.
+-\fI$LOCKDIR\fR\.
+\fI/var/run/samba\fR.
.RE
.PP
- gss-spnego-client
-Index: samba-3.0.28a/docs/manpages/tdbbackup.8
+ gss\-spnego\-client
+Index: samba-3.0.29/docs/manpages/tdbbackup.8
===================================================================
---- samba-3.0.28a.orig/docs/manpages/tdbbackup.8
-+++ samba-3.0.28a/docs/manpages/tdbbackup.8
-@@ -70,17 +70,17 @@
- \(bu
+--- samba-3.0.29.orig/docs/manpages/tdbbackup.8
++++ samba-3.0.29/docs/manpages/tdbbackup.8
+@@ -69,7 +69,7 @@
+ .\}
- 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
+ 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.
+ .RE
+ .sp
+ .RS 4
+@@ -82,7 +82,7 @@
+ .\}
- 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
+ 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.
+ .RE
+ .sp
+ .RS 4
+@@ -95,7 +95,7 @@
+ .\}
- *.tdb
--located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories.
+ *\.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.28a/docs/manpages/winbindd.8
+ This man page is correct for version 3\.0 of the Samba suite\.
+Index: samba-3.0.29/docs/manpages/winbindd.8
===================================================================
---- samba-3.0.28a.orig/docs/manpages/winbindd.8
-+++ samba-3.0.28a/docs/manpages/winbindd.8
-@@ -440,16 +440,16 @@
- file are owned by root.
+--- samba-3.0.29.orig/docs/manpages/winbindd.8
++++ samba-3.0.29/docs/manpages/winbindd.8
+@@ -518,16 +518,16 @@
+ file are owned by root\.
.RE
.PP
-$LOCKDIR/winbindd_privileged/pipe
+/var/run/samba/winbindd_privileged/pipe
- .RS 3n
- The UNIX pipe over which 'privileged' clients communicate with the
+ .RS 4
+ The UNIX pipe over which \'privileged\' clients communicate with the
winbindd
- program. For security reasons, access to some winbindd functions - like those needed by the
+ program\. For security reasons, access to some winbindd functions \- like those needed by the
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
+-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
+\fI/var/run/samba/winbindd_privileged\fR
directory and
-\fI$LOCKDIR/winbindd_privileged/pipe\fR
+\fI/var/run/samba/winbindd_privileged/pipe\fR
- file are owned by root.
+ file are owned by root\.
.RE
.PP
-@@ -458,15 +458,12 @@
- Implementation of name service switch library.
+@@ -536,15 +536,12 @@
+ Implementation of name service switch library\.
.RE
.PP
--$LOCKDIR/winbindd_idmap.tdb
-+/var/run/samba/winbindd_idmap.tdb
- .RS 3n
--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
--\fI/usr/local/samba/var/locks \fR.
+-$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
+-\fI/usr/local/samba/var/locks \fR\.
+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 3n
- Storage for cached user and group information.
+-$LOCKDIR/winbindd_cache\.tdb
++/var/run/samba/winbindd_cache\.tdb
+ .RS 4
+ Storage for cached user and group information\.
.RE
Modified: trunk/samba/debian/patches/fhs-assignpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-assignpaths.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/fhs-assignpaths.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -7,10 +7,10 @@
Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
change their default behaviour
-Index: samba-3.0.28a/source/configure.in
+Index: samba-3.0.29/source/configure.in
===================================================================
---- samba-3.0.28a.orig/source/configure.in
-+++ samba-3.0.28a/source/configure.in
+--- samba-3.0.29.orig/source/configure.in
++++ samba-3.0.29/source/configure.in
@@ -51,7 +51,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/fhs-filespaths.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -45,10 +45,10 @@
grep -r lp_lockdir source/ | grep -vE \
'%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-Index: samba-3.0.28a/source/intl/lang_tdb.c
+Index: samba-3.0.29/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.28a.orig/source/intl/lang_tdb.c
-+++ samba-3.0.28a/source/intl/lang_tdb.c
+--- samba-3.0.29.orig/source/intl/lang_tdb.c
++++ samba-3.0.29/source/intl/lang_tdb.c
@@ -131,7 +131,7 @@
if (!lang)
return True;
@@ -58,10 +58,10 @@
if (stat(msg_path, &st) != 0) {
/* the msg file isn't available */
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
-Index: samba-3.0.28a/source/lib/util_unistr.c
+Index: samba-3.0.29/source/lib/util_unistr.c
===================================================================
---- samba-3.0.28a.orig/source/lib/util_unistr.c
-+++ samba-3.0.28a/source/lib/util_unistr.c
+--- samba-3.0.29.orig/source/lib/util_unistr.c
++++ samba-3.0.29/source/lib/util_unistr.c
@@ -88,11 +88,11 @@
}
initialised = 1;
@@ -85,10 +85,10 @@
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-Index: samba-3.0.28a/source/libsmb/samlogon_cache.c
+Index: samba-3.0.29/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.28a.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.0.28a/source/libsmb/samlogon_cache.c
+--- samba-3.0.29.orig/source/libsmb/samlogon_cache.c
++++ samba-3.0.29/source/libsmb/samlogon_cache.c
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -107,10 +107,10 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
-Index: samba-3.0.28a/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.29/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.28a.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.0.28a/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.29.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.0.29/source/nmbd/nmbd_serverlistdb.c
@@ -325,7 +325,7 @@
updatecount++;
@@ -120,10 +120,10 @@
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.28a/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.29/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.28a.orig/source/nmbd/nmbd_winsserver.c
-+++ samba-3.0.28a/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.29.orig/source/nmbd/nmbd_winsserver.c
++++ samba-3.0.29/source/nmbd/nmbd_winsserver.c
@@ -585,7 +585,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -142,10 +142,10 @@
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-Index: samba-3.0.28a/source/passdb/login_cache.c
+Index: samba-3.0.29/source/passdb/login_cache.c
===================================================================
---- samba-3.0.28a.orig/source/passdb/login_cache.c
-+++ samba-3.0.28a/source/passdb/login_cache.c
+--- samba-3.0.29.orig/source/passdb/login_cache.c
++++ samba-3.0.29/source/passdb/login_cache.c
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -155,11 +155,11 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.0.28a/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.29/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.28a.orig/source/nsswitch/winbindd_cache.c
-+++ samba-3.0.28a/source/nsswitch/winbindd_cache.c
-@@ -2181,7 +2181,7 @@
+--- samba-3.0.29.orig/source/nsswitch/winbindd_cache.c
++++ samba-3.0.29/source/nsswitch/winbindd_cache.c
+@@ -2188,7 +2188,7 @@
return True;
/* when working offline we must not clear the cache on restart */
@@ -168,7 +168,7 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -2224,9 +2224,9 @@
+@@ -2231,9 +2231,9 @@
tdb_close(wcache->tdb);
wcache->tdb = NULL;
@@ -180,7 +180,7 @@
strerror(errno) ));
return False;
}
-@@ -2488,7 +2488,7 @@
+@@ -2495,7 +2495,7 @@
return;
/* when working offline we must not clear the cache on restart */
@@ -189,10 +189,10 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.28a/source/param/loadparm.c
+Index: samba-3.0.29/source/param/loadparm.c
===================================================================
---- samba-3.0.28a.orig/source/param/loadparm.c
-+++ samba-3.0.28a/source/param/loadparm.c
+--- samba-3.0.29.orig/source/param/loadparm.c
++++ samba-3.0.29/source/param/loadparm.c
@@ -108,6 +108,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -226,10 +226,10 @@
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
string_set(&Globals.szUsershareTemplateShare, "");
-Index: samba-3.0.28a/source/passdb/secrets.c
+Index: samba-3.0.29/source/passdb/secrets.c
===================================================================
---- samba-3.0.28a.orig/source/passdb/secrets.c
-+++ samba-3.0.28a/source/passdb/secrets.c
+--- samba-3.0.29.orig/source/passdb/secrets.c
++++ samba-3.0.29/source/passdb/secrets.c
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -240,11 +240,11 @@
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.28a/source/printing/nt_printing.c
+Index: samba-3.0.29/source/printing/nt_printing.c
===================================================================
---- samba-3.0.28a.orig/source/printing/nt_printing.c
-+++ samba-3.0.28a/source/printing/nt_printing.c
-@@ -551,28 +551,28 @@
+--- samba-3.0.29.orig/source/printing/nt_printing.c
++++ samba-3.0.29/source/printing/nt_printing.c
+@@ -560,28 +560,28 @@
if (tdb_drivers)
tdb_close(tdb_drivers);
@@ -279,7 +279,7 @@
return False;
}
-@@ -2359,7 +2359,7 @@
+@@ -2368,7 +2368,7 @@
close_all_print_db();
if (geteuid() == 0) {
@@ -288,10 +288,10 @@
pstrcat(printdb_path, sharename);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.28a/source/printing/printing.c
+Index: samba-3.0.29/source/printing/printing.c
===================================================================
---- samba-3.0.28a.orig/source/printing/printing.c
-+++ samba-3.0.28a/source/printing/printing.c
+--- samba-3.0.29.orig/source/printing/printing.c
++++ samba-3.0.29/source/printing/printing.c
@@ -185,8 +185,8 @@
int services = lp_numservices();
int snum;
@@ -303,10 +303,10 @@
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-Index: samba-3.0.28a/source/printing/printing_db.c
+Index: samba-3.0.29/source/printing/printing_db.c
===================================================================
---- samba-3.0.28a.orig/source/printing/printing_db.c
-+++ samba-3.0.28a/source/printing/printing_db.c
+--- samba-3.0.29.orig/source/printing/printing_db.c
++++ samba-3.0.29/source/printing/printing_db.c
@@ -91,7 +91,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -316,10 +316,10 @@
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.28a/source/smbd/lanman.c
+Index: samba-3.0.29/source/smbd/lanman.c
===================================================================
---- samba-3.0.28a.orig/source/smbd/lanman.c
-+++ samba-3.0.28a/source/smbd/lanman.c
+--- samba-3.0.29.orig/source/smbd/lanman.c
++++ samba-3.0.29/source/smbd/lanman.c
@@ -1094,9 +1094,9 @@
BOOL local_list_only;
int i;
@@ -332,10 +332,10 @@
return 0;
}
-Index: samba-3.0.28a/source/registry/reg_db.c
+Index: samba-3.0.29/source/registry/reg_db.c
===================================================================
---- samba-3.0.28a.orig/source/registry/reg_db.c
-+++ samba-3.0.28a/source/registry/reg_db.c
+--- samba-3.0.29.orig/source/registry/reg_db.c
++++ samba-3.0.29/source/registry/reg_db.c
@@ -234,12 +234,12 @@
if ( tdb_reg )
return True;
@@ -366,10 +366,10 @@
}
unbecome_root();
-Index: samba-3.0.28a/source/lib/account_pol.c
+Index: samba-3.0.29/source/lib/account_pol.c
===================================================================
---- samba-3.0.28a.orig/source/lib/account_pol.c
-+++ samba-3.0.28a/source/lib/account_pol.c
+--- samba-3.0.29.orig/source/lib/account_pol.c
++++ samba-3.0.29/source/lib/account_pol.c
@@ -213,9 +213,9 @@
return True;
}
@@ -382,10 +382,10 @@
if (!tdb) {
DEBUG(0,("Failed to open account policy database\n"));
return False;
-Index: samba-3.0.28a/source/registry/reg_perfcount.c
+Index: samba-3.0.29/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.28a.orig/source/registry/reg_perfcount.c
-+++ samba-3.0.28a/source/registry/reg_perfcount.c
+--- samba-3.0.29.orig/source/registry/reg_perfcount.c
++++ samba-3.0.29/source/registry/reg_perfcount.c
@@ -46,7 +46,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -404,10 +404,10 @@
/* no registry keys; just create the perfmon directory */
-Index: samba-3.0.28a/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.29/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.28a.orig/source/rpc_server/srv_eventlog_lib.c
-+++ samba-3.0.28a/source/rpc_server/srv_eventlog_lib.c
+--- samba-3.0.29.orig/source/rpc_server/srv_eventlog_lib.c
++++ samba-3.0.29/source/rpc_server/srv_eventlog_lib.c
@@ -67,7 +67,7 @@
{
fstring path;
@@ -426,10 +426,10 @@
if ( !directory_exist( eventlogdir, NULL ) )
mkdir( eventlogdir, 0755 );
-Index: samba-3.0.28a/source/passdb/pdb_tdb.c
+Index: samba-3.0.29/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.28a.orig/source/passdb/pdb_tdb.c
-+++ samba-3.0.28a/source/passdb/pdb_tdb.c
+--- samba-3.0.29.orig/source/passdb/pdb_tdb.c
++++ samba-3.0.29/source/passdb/pdb_tdb.c
@@ -1559,7 +1559,7 @@
uint32 rid;
BOOL ret = False;
@@ -448,10 +448,10 @@
pfile = tdbfile;
}
pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.28a/source/groupdb/mapping_tdb.c
+Index: samba-3.0.29/source/groupdb/mapping_tdb.c
===================================================================
---- samba-3.0.28a.orig/source/groupdb/mapping_tdb.c
-+++ samba-3.0.28a/source/groupdb/mapping_tdb.c
+--- samba-3.0.29.orig/source/groupdb/mapping_tdb.c
++++ samba-3.0.29/source/groupdb/mapping_tdb.c
@@ -39,7 +39,7 @@
if (tdb)
return True;
@@ -461,10 +461,10 @@
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-Index: samba-3.0.28a/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.29/source/nsswitch/idmap_tdb.c
===================================================================
---- samba-3.0.28a.orig/source/nsswitch/idmap_tdb.c
-+++ samba-3.0.28a/source/nsswitch/idmap_tdb.c
+--- samba-3.0.29.orig/source/nsswitch/idmap_tdb.c
++++ samba-3.0.29/source/nsswitch/idmap_tdb.c
@@ -247,7 +247,7 @@
}
@@ -474,10 +474,10 @@
if (!tdbfile) {
DEBUG(0, ("Out of memory!\n"));
ret = NT_STATUS_NO_MEMORY;
-Index: samba-3.0.28a/source/utils/smbcontrol.c
+Index: samba-3.0.29/source/utils/smbcontrol.c
===================================================================
---- samba-3.0.28a.orig/source/utils/smbcontrol.c
-+++ samba-3.0.28a/source/utils/smbcontrol.c
+--- samba-3.0.29.orig/source/utils/smbcontrol.c
++++ samba-3.0.29/source/utils/smbcontrol.c
@@ -832,10 +832,10 @@
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
@@ -507,10 +507,10 @@
return False;
}
-Index: samba-3.0.28a/source/lib/sharesec.c
+Index: samba-3.0.29/source/lib/sharesec.c
===================================================================
---- samba-3.0.28a.orig/source/lib/sharesec.c
-+++ samba-3.0.28a/source/lib/sharesec.c
+--- samba-3.0.29.orig/source/lib/sharesec.c
++++ samba-3.0.29/source/lib/sharesec.c
@@ -47,10 +47,10 @@
return True;
}
@@ -524,10 +524,10 @@
return False;
}
-Index: samba-3.0.28a/source/libgpo/gpo_fetch.c
+Index: samba-3.0.29/source/libgpo/gpo_fetch.c
===================================================================
---- samba-3.0.28a.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.0.28a/source/libgpo/gpo_fetch.c
+--- samba-3.0.29.orig/source/libgpo/gpo_fetch.c
++++ samba-3.0.29/source/libgpo/gpo_fetch.c
@@ -60,7 +60,7 @@
return NT_STATUS_NO_MEMORY;
}
@@ -546,10 +546,10 @@
char *current_dir;
fstring tok;
-Index: samba-3.0.28a/source/nsswitch/idmap_cache.c
+Index: samba-3.0.29/source/nsswitch/idmap_cache.c
===================================================================
---- samba-3.0.28a.orig/source/nsswitch/idmap_cache.c
-+++ samba-3.0.28a/source/nsswitch/idmap_cache.c
+--- samba-3.0.29.orig/source/nsswitch/idmap_cache.c
++++ samba-3.0.29/source/nsswitch/idmap_cache.c
@@ -55,7 +55,7 @@
return NULL;
}
Modified: trunk/samba/debian/patches/fhs-newpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-newpaths.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/fhs-newpaths.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -10,10 +10,10 @@
Note: See fhs-filespaths for rationale about the meaning of the new
path variables
-Index: samba-3.0.28a/source/Makefile.in
+Index: samba-3.0.29/source/Makefile.in
===================================================================
---- samba-3.0.28a.orig/source/Makefile.in
-+++ samba-3.0.28a/source/Makefile.in
+--- samba-3.0.29.orig/source/Makefile.in
++++ samba-3.0.29/source/Makefile.in
@@ -106,6 +106,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -50,10 +50,10 @@
installswat: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.28a/source/configure.in
+Index: samba-3.0.29/source/configure.in
===================================================================
---- samba-3.0.28a.orig/source/configure.in
-+++ samba-3.0.28a/source/configure.in
+--- samba-3.0.29.orig/source/configure.in
++++ samba-3.0.29/source/configure.in
@@ -59,6 +59,10 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
@@ -75,10 +75,10 @@
AC_SUBST(rootsbindir)
AC_SUBST(pammodulesdir)
-Index: samba-3.0.28a/source/dynconfig.c
+Index: samba-3.0.29/source/dynconfig.c
===================================================================
---- samba-3.0.28a.orig/source/dynconfig.c
-+++ samba-3.0.28a/source/dynconfig.c
+--- samba-3.0.29.orig/source/dynconfig.c
++++ samba-3.0.29/source/dynconfig.c
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -121,10 +121,10 @@
+ return lp_lockdir();
+#endif
+}
-Index: samba-3.0.28a/source/include/dynconfig.h
+Index: samba-3.0.29/source/include/dynconfig.h
===================================================================
---- samba-3.0.28a.orig/source/include/dynconfig.h
-+++ samba-3.0.28a/source/include/dynconfig.h
+--- samba-3.0.29.orig/source/include/dynconfig.h
++++ samba-3.0.29/source/include/dynconfig.h
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -138,10 +138,10 @@
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-Index: samba-3.0.28a/source/lib/util.c
+Index: samba-3.0.29/source/lib/util.c
===================================================================
---- samba-3.0.28a.orig/source/lib/util.c
-+++ samba-3.0.28a/source/lib/util.c
+--- samba-3.0.29.orig/source/lib/util.c
++++ samba-3.0.29/source/lib/util.c
@@ -2633,6 +2633,61 @@
}
Modified: trunk/samba/debian/patches/installswat.sh.patch
===================================================================
--- trunk/samba/debian/patches/installswat.sh.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/installswat.sh.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.28a/source/script/installswat.sh
+Index: samba-3.0.29/source/script/installswat.sh
===================================================================
---- samba-3.0.28a.orig/source/script/installswat.sh
-+++ samba-3.0.28a/source/script/installswat.sh
+--- samba-3.0.29.orig/source/script/installswat.sh
++++ samba-3.0.29/source/script/installswat.sh
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
Deleted: trunk/samba/debian/patches/manpage-encoding.patch
===================================================================
--- trunk/samba/debian/patches/manpage-encoding.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/manpage-encoding.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -1,455 +0,0 @@
-Goal: Don't use non-portable nbsp characters in manpage synopses
-
-Fixes: 470844
-
-Status wrt upstream: not suitable for submission
-
-Note: should be superseded by a fixed db2man toolchain upstream
-
-Index: samba-3.0.28/docs/manpages/findsmb.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/findsmb.1
-+++ samba-3.0.28/docs/manpages/findsmb.1
-@@ -22,7 +22,7 @@
- findsmb - list info about machines that respond to SMB name queries on a subnet
- .SH "SYNOPSIS"
- .HP 1
--findsmb [subnet broadcast address]
-+findsmb [subnet\ broadcast\ address]
- .SH "DESCRIPTION"
- .PP
- This perl script is part of the
-Index: samba-3.0.28/docs/manpages/nmblookup.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/nmblookup.1
-+++ samba-3.0.28/docs/manpages/nmblookup.1
-@@ -22,7 +22,7 @@
- nmblookup - NetBIOS over TCP/IP client used to lookup NetBIOS names
- .SH "SYNOPSIS"
- .HP 1
--nmblookup [-M] [-R] [-S] [-r] [-A] [-h] [-B <broadcast address>] [-U <unicast address>] [-d <debug level>] [-s <smb config file>] [-i <NetBIOS scope>] [-T] [-f] {name}
-+nmblookup [-M] [-R] [-S] [-r] [-A] [-h] [-B\ <broadcast\ address>] [-U\ <unicast\ address>] [-d\ <debug\ level>] [-s\ <smb\ config\ file>] [-i\ <NetBIOS\ scope>] [-T] [-f] {name}
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbd.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbd.8
-+++ samba-3.0.28/docs/manpages/smbd.8
-@@ -22,7 +22,7 @@
- smbd - server to provide SMB/CIFS services to clients
- .SH "SYNOPSIS"
- .HP 1
--smbd [-D] [-F] [-S] [-i] [-h] [-V] [-b] [-d <debug level>] [-l <log directory>] [-p <port number(s)>] [-P <profiling level>] [-O <socket option>] [-s <configuration file>]
-+smbd [-D] [-F] [-S] [-i] [-h] [-V] [-b] [-d\ <debug\ level>] [-l\ <log\ directory>] [-p\ <port\ number(s)>] [-P\ <profiling\ level>] [-O\ <socket\ option>] [-s\ <configuration\ file>]
- .SH "DESCRIPTION"
- .PP
- This program is part of the
-Index: samba-3.0.28/docs/manpages/wbinfo.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/wbinfo.1
-+++ samba-3.0.28/docs/manpages/wbinfo.1
-@@ -22,7 +22,7 @@
- wbinfo - Query information from winbind daemon
- .SH "SYNOPSIS"
- .HP 1
--wbinfo [-a user%password] [--all-domains] [--allocate-gid] [--allocate-uid] [-D domain] [--domain domain] [-g] [--getdcname domain] [--get-auth-user] [-G gid] [-h] [-i user] [-I ip] [-K user%password] [-m] [-n name] [-N netbios-name] [--own-domain] [-p] [-r user] [-s sid] [--separator] [--sequence] [--set-auth-user user%password] [-S sid] [-t] [-u] [--user-domgroups sid] [--user-sids sid] [-U uid] [-V] [-Y sid]
-+wbinfo [-a\ user%password] [--all-domains] [--allocate-gid] [--allocate-uid] [-D\ domain] [--domain\ domain] [-g] [--getdcname\ domain] [--get-auth-user] [-G\ gid] [-h] [-i\ user] [-I\ ip] [-K\ user%password] [-m] [-n\ name] [-N\ netbios-name] [--own-domain] [-p] [-r\ user] [-s\ sid] [--separator] [--sequence] [--set-auth-user\ user%password] [-S\ sid] [-t] [-u] [--user-domgroups\ sid] [--user-sids\ sid] [-U\ uid] [-V] [-Y\ sid]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/eventlogadm.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/eventlogadm.8
-+++ samba-3.0.28/docs/manpages/eventlogadm.8
-@@ -22,9 +22,9 @@
- eventlogadm - push records into the Samba event log store
- .SH "SYNOPSIS"
- .HP 1
--eventlogadm [\fB-d\fR] [\fB-h\fR] \fB-o\fR addsource \fIEVENTLOG\fR \fISOURCENAME\fR \fIMSGFILE\fR
-+eventlogadm [\fB-d\fR] [\fB-h\fR] \fB-o\fR\ addsource\ \fIEVENTLOG\fR\ \fISOURCENAME\fR\ \fIMSGFILE\fR
- .HP 1
--eventlogadm [\fB-d\fR] [\fB-h\fR] \fB-o\fR write \fIEVENTLOG\fR
-+eventlogadm [\fB-d\fR] [\fB-h\fR] \fB-o\fR\ write\ \fIEVENTLOG\fR
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/profiles.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/profiles.1
-+++ samba-3.0.28/docs/manpages/profiles.1
-@@ -22,7 +22,7 @@
- profiles - A utility to report and change SIDs in registry files
- .SH "SYNOPSIS"
- .HP 1
--profiles [-v] [-c SID] [-n SID] {file}
-+profiles [-v] [-c\ SID] [-n\ SID] {file}
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/rpcclient.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/rpcclient.1
-+++ samba-3.0.28/docs/manpages/rpcclient.1
-@@ -22,7 +22,7 @@
- rpcclient - tool for executing client side MS-RPC functions
- .SH "SYNOPSIS"
- .HP 1
--rpcclient [-A authfile] [-c <command string>] [-d debuglevel] [-h] [-l logdir] [-N] [-s <smb config file>] [-U username[%password]] [-W workgroup] [-N] [-I destinationIP] {server}
-+rpcclient [-A\ authfile] [-c\ <command\ string>] [-d\ debuglevel] [-h] [-l\ logdir] [-N] [-s\ <smb\ config\ file>] [-U\ username[%password]] [-W\ workgroup] [-N] [-I\ destinationIP] {server}
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/mount.cifs.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/mount.cifs.8
-+++ samba-3.0.28/docs/manpages/mount.cifs.8
-@@ -22,7 +22,7 @@
- mount.cifs - mount using the Common Internet File System (CIFS)
- .SH "SYNOPSIS"
- .HP 1
--mount.cifs {service} {mount-point} [-o options]
-+mount.cifs {service} {mount-point} [-o options]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/net.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/net.8
-+++ samba-3.0.28/docs/manpages/net.8
-@@ -22,7 +22,7 @@
- net - Tool for administration of Samba and remote CIFS servers.
- .SH "SYNOPSIS"
- .HP 1
--net {<ads|rap|rpc>} [-h] [-w workgroup] [-W myworkgroup] [-U user] [-I ip-address] [-p port] [-n myname] [-s conffile] [-S server] [-l] [-P] [-d debuglevel] [-V]
-+net {<ads|rap|rpc>} [-h] [-w workgroup] [-W myworkgroup] [-U user] [-I ip-address] [-p port] [-n myname] [-s conffile] [-S server] [-l] [-P] [-d debuglevel] [-V]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/nmbd.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/nmbd.8
-+++ samba-3.0.28/docs/manpages/nmbd.8
-@@ -22,7 +22,7 @@
- nmbd - NetBIOS name server to provide NetBIOS over IP naming services to clients
- .SH "SYNOPSIS"
- .HP 1
--nmbd [-D] [-F] [-S] [-a] [-i] [-o] [-h] [-V] [-d <debug level>] [-H <lmhosts file>] [-l <log directory>] [-p <port number>] [-s <configuration file>]
-+nmbd [-D] [-F] [-S] [-a] [-i] [-o] [-h] [-V] [-d <debug level>] [-H <lmhosts file>] [-l <log directory>] [-p <port number>] [-s <configuration file>]
- .SH "DESCRIPTION"
- .PP
- This program is part of the
-Index: samba-3.0.28/docs/manpages/ntlm_auth.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.0.28/docs/manpages/ntlm_auth.1
-@@ -22,7 +22,7 @@
- ntlm_auth - tool to allow external access to Winbind's NTLM authentication function
- .SH "SYNOPSIS"
- .HP 1
--ntlm_auth [-d debuglevel] [-l logdir] [-s <smb config file>]
-+ntlm_auth [-d debuglevel] [-l logdir] [-s <smb config file>]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-@@ -122,9 +122,9 @@
- The username, expected to be in Samba's
- unix charset.
- .sp
--\fBExample 1. \fRUsername: bob
-+\fBExample 1. \fRUsername: bob
- .sp
--\fBExample 2. \fRUsername:: Ym9i
-+\fBExample 2. \fRUsername:: Ym9i
- .RE
- .PP
- Username
-@@ -132,9 +132,9 @@
- The user's domain, expected to be in Samba's
- unix charset.
- .sp
--\fBExample 3. \fRDomain: WORKGROUP
-+\fBExample 3. \fRDomain: WORKGROUP
- .sp
--\fBExample 4. \fRDomain:: V09SS0dST1VQ
-+\fBExample 4. \fRDomain:: V09SS0dST1VQ
- .RE
- .PP
- Full-Username
-@@ -144,9 +144,9 @@
- and qualified with the
- winbind separator.
- .sp
--\fBExample 5. \fRFull-Username: WORKGROUP\bob
-+\fBExample 5. \fRFull-Username: WORKGROUP\bob
- .sp
--\fBExample 6. \fRFull-Username:: V09SS0dST1VQYm9i
-+\fBExample 6. \fRFull-Username:: V09SS0dST1VQYm9i
- .RE
- .PP
- LANMAN-Challenge
-@@ -155,7 +155,7 @@
- LANMAN Challenge
- value, generated randomly by the server, or (in cases such as MSCHAPv2) generated in some way by both the server and the client.
- .sp
--\fBExample 7. \fRLANMAN-Challege: 0102030405060708
-+\fBExample 7. \fRLANMAN-Challege: 0102030405060708
- .RE
- .PP
- LANMAN-Response
-@@ -165,7 +165,7 @@
- value, calculated from the user's password and the supplied
- LANMAN Challenge. Typically, this is provided over the network by a client wishing to authenticate.
- .sp
--\fBExample 8. \fRLANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
-+\fBExample 8. \fRLANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
- .RE
- .PP
- NT-Response
-@@ -175,30 +175,30 @@
- calculated from the user's password and the supplied
- LANMAN Challenge. Typically, this is provided over the network by a client wishing to authenticate.
- .sp
--\fBExample 9. \fRNT-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
-+\fBExample 9. \fRNT-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
- .RE
- .PP
- Password
- .RS 3n
- The user's password. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way.
- .sp
--\fBExample 10. \fRPassword: samba2
-+\fBExample 10. \fRPassword: samba2
- .sp
--\fBExample 11. \fRPassword:: c2FtYmEy
-+\fBExample 11. \fRPassword:: c2FtYmEy
- .RE
- .PP
- Request-User-Session-Key
- .RS 3n
- Apon sucessful authenticaiton, return the user session key associated with the login.
- .sp
--\fBExample 12. \fRRequest-User-Session-Key: Yes
-+\fBExample 12. \fRRequest-User-Session-Key: Yes
- .RE
- .PP
- Request-LanMan-Session-Key
- .RS 3n
- Apon sucessful authenticaiton, return the LANMAN session key associated with the login.
- .sp
--\fBExample 13. \fRRequest-LanMan-Session-Key: Yes
-+\fBExample 13. \fRRequest-LanMan-Session-Key: Yes
- .RE
- .sp
- .it 1 an-trap
-Index: samba-3.0.28/docs/manpages/pdbedit.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/pdbedit.8
-+++ samba-3.0.28/docs/manpages/pdbedit.8
-@@ -22,7 +22,7 @@
- pdbedit - manage the SAM database (Database of Samba Users)
- .SH "SYNOPSIS"
- .HP 1
--pdbedit [-L] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-t, --password-from-stdin] [-m] [-r] [-x] [-i passdb-backend] [-e passdb-backend] [-b passdb-backend] [-g] [-d debuglevel] [-s configfile] [-P account-policy] [-C value] [-c account-control] [-y]
-+pdbedit [-L] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-t, --password-from-stdin] [-m] [-r] [-x] [-i passdb-backend] [-e passdb-backend] [-b passdb-backend] [-g] [-d debuglevel] [-s configfile] [-P account-policy] [-C value] [-c account-control] [-y]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbcacls.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbcacls.1
-+++ samba-3.0.28/docs/manpages/smbcacls.1
-@@ -22,7 +22,7 @@
- smbcacls - Set or get ACLs on an NT file or directory names
- .SH "SYNOPSIS"
- .HP 1
--smbcacls {//server/share} {filename} [-D acls] [-M acls] [-a acls] [-S acls] [-C name] [-G name] [--numeric] [-t] [-U username] [-h] [-d]
-+smbcacls {//server/share} {filename} [-D acls] [-M acls] [-a acls] [-S acls] [-C name] [-G name] [--numeric] [-t] [-U username] [-h] [-d]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbclient.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbclient.1
-+++ samba-3.0.28/docs/manpages/smbclient.1
-@@ -22,9 +22,9 @@
- smbclient - ftp-like client to access SMB/CIFS resources on servers
- .SH "SYNOPSIS"
- .HP 1
--smbclient [-b <buffer size>] [-d debuglevel] [-L <netbios name>] [-U username] [-I destinationIP] [-M <netbios name>] [-m maxprotocol] [-A authfile] [-N] [-i scope] [-O <socket options>] [-p port] [-R <name resolve order>] [-s <smb config file>] [-k] [-P] [-c <command>]
-+smbclient [-b <buffer size>] [-d debuglevel] [-L <netbios name>] [-U username] [-I destinationIP] [-M <netbios name>] [-m maxprotocol] [-A authfile] [-N] [-i scope] [-O <socket options>] [-p port] [-R <name resolve order>] [-s <smb config file>] [-k] [-P] [-c <command>]
- .HP 1
--smbclient {servicename} [password] [-b <buffer size>] [-d debuglevel] [-D Directory] [-U username] [-W workgroup] [-M <netbios name>] [-m maxprotocol] [-A authfile] [-N] [-l logdir] [-I destinationIP] [-E] [-c <command string>] [-i scope] [-O <socket options>] [-p port] [-R <name resolve order>] [-s <smb config file>] [-T<c|x>IXFqgbNan] [-k]
-+smbclient {servicename} [password] [-b <buffer size>] [-d debuglevel] [-D Directory] [-U username] [-W workgroup] [-M <netbios name>] [-m maxprotocol] [-A authfile] [-N] [-l logdir] [-I destinationIP] [-E] [-c <command string>] [-i scope] [-O <socket options>] [-p port] [-R <name resolve order>] [-s <smb config file>] [-T<c|x>IXFqgbNan] [-k]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbcquotas.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbcquotas.1
-+++ samba-3.0.28/docs/manpages/smbcquotas.1
-@@ -22,7 +22,7 @@
- smbcquotas - Set or get QUOTAs of NTFS 5 shares
- .SH "SYNOPSIS"
- .HP 1
--smbcquotas {//server/share} [-u user] [-L] [-F] [-S QUOTA_SET_COMMAND] [-n] [-t] [-v] [-d debuglevel] [-s configfile] [-l logdir] [-V] [-U username] [-N] [-k] [-A]
-+smbcquotas {//server/share} [-u user] [-L] [-F] [-S QUOTA_SET_COMMAND] [-n] [-t] [-v] [-d debuglevel] [-s configfile] [-l logdir] [-V] [-U username] [-N] [-k] [-A]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbget.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbget.1
-+++ samba-3.0.28/docs/manpages/smbget.1
-@@ -22,7 +22,7 @@
- smbget - wget-like utility for download files over SMB
- .SH "SYNOPSIS"
- .HP 1
--smbget [-a, --guest] [-r, --resume] [-R, --recursive] [-u, --username=STRING] [-p, --password=STRING] [-w, --workgroup=STRING] [-n, --nonprompt] [-d, --debuglevel=INT] [-D, --dots] [-P, --keep-permissions] [-o, --outputfile] [-f, --rcfile] [-q, --quiet] [-v, --verbose] [-b, --blocksize] [-?, --help] [--usage] {smb://host/share/path/to/file} [smb://url2/] [...]
-+smbget [-a, --guest] [-r, --resume] [-R, --recursive] [-u, --username=STRING] [-p, --password=STRING] [-w, --workgroup=STRING] [-n, --nonprompt] [-d, --debuglevel=INT] [-D, --dots] [-P, --keep-permissions] [-o, --outputfile] [-f, --rcfile] [-q, --quiet] [-v, --verbose] [-b, --blocksize] [-?, --help] [--usage] {smb://host/share/path/to/file} [smb://url2/] [...]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbmnt.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbmnt.8
-+++ samba-3.0.28/docs/manpages/smbmnt.8
-@@ -22,7 +22,7 @@
- smbmnt - helper utility for mounting SMB filesystems
- .SH "SYNOPSIS"
- .HP 1
--smbmnt {mount-point} [-s <share>] [-r] [-u <uid>] [-g <gid>] [-f <mask>] [-d <mask>] [-o <options>] [-h]
-+smbmnt {mount-point} [-s <share>] [-r] [-u <uid>] [-g <gid>] [-f <mask>] [-d <mask>] [-o <options>] [-h]
- .SH "DESCRIPTION"
- .PP
- smbmnt
-Index: samba-3.0.28/docs/manpages/smbmount.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbmount.8
-+++ samba-3.0.28/docs/manpages/smbmount.8
-@@ -22,7 +22,7 @@
- smbmount - mount an smbfs filesystem
- .SH "SYNOPSIS"
- .HP 1
--smbmount {service} {mount-point} [-o options]
-+smbmount {service} {mount-point} [-o options]
- .SH "DESCRIPTION"
- .PP
- smbmount
-Index: samba-3.0.28/docs/manpages/smbpasswd.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbpasswd.8
-+++ samba-3.0.28/docs/manpages/smbpasswd.8
-@@ -22,7 +22,7 @@
- smbpasswd - change a user's SMB password
- .SH "SYNOPSIS"
- .HP 1
--smbpasswd [-a] [-c <config file>] [-x] [-d] [-e] [-D debuglevel] [-n] [-r <remote machine>] [-R <name resolve order>] [-m] [-U username[%password]] [-h] [-s] [-w pass] [-W] [-i] [-L] [username]
-+smbpasswd [-a] [-c <config file>] [-x] [-d] [-e] [-D debuglevel] [-n] [-r <remote machine>] [-R <name resolve order>] [-m] [-U username[%password]] [-h] [-s] [-w pass] [-W] [-i] [-L] [username]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbsh.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbsh.1
-+++ samba-3.0.28/docs/manpages/smbsh.1
-@@ -22,7 +22,7 @@
- smbsh - Allows access to remote SMB shares using UNIX commands
- .SH "SYNOPSIS"
- .HP 1
--smbsh [-W workgroup] [-U username] [-P prefix] [-R <name resolve order>] [-d <debug level>] [-l logdir] [-L libdir]
-+smbsh [-W workgroup] [-U username] [-P prefix] [-R <name resolve order>] [-d <debug level>] [-l logdir] [-L libdir]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbstatus.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbstatus.1
-+++ samba-3.0.28/docs/manpages/smbstatus.1
-@@ -22,7 +22,7 @@
- smbstatus - report on current Samba connections
- .SH "SYNOPSIS"
- .HP 1
--smbstatus [-P] [-b] [-d <debug level>] [-v] [-L] [-B] [-p] [-S] [-s <configuration file>] [-u <username>]
-+smbstatus [-P] [-b] [-d <debug level>] [-v] [-L] [-B] [-p] [-S] [-s <configuration file>] [-u <username>]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/smbtar.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/smbtar.1
-+++ samba-3.0.28/docs/manpages/smbtar.1
-@@ -22,7 +22,7 @@
- smbtar - shell script for backing up SMB/CIFS shares directly to UNIX tape drives
- .SH "SYNOPSIS"
- .HP 1
--smbtar [-r] [-i] [-a] [-v] {-s server} [-p password] [-x services] [-X] [-N filename] [-b blocksize] [-d directory] [-l loglevel] [-u user] [-t tape] {filenames}
-+smbtar [-r] [-i] [-a] [-v] {-s server} [-p password] [-x services] [-X] [-N filename] [-b blocksize] [-d directory] [-l loglevel] [-u user] [-t tape] {filenames}
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/swat.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/swat.8
-+++ samba-3.0.28/docs/manpages/swat.8
-@@ -22,7 +22,7 @@
- swat - Samba Web Administration Tool
- .SH "SYNOPSIS"
- .HP 1
--swat [-s <smb config file>] [-a] [-P]
-+swat [-s <smb config file>] [-a] [-P]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/tdbbackup.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/tdbbackup.8
-+++ samba-3.0.28/docs/manpages/tdbbackup.8
-@@ -22,7 +22,7 @@
- tdbbackup - tool for backing up and for validating the integrity of samba .tdb files
- .SH "SYNOPSIS"
- .HP 1
--tdbbackup [-s suffix] [-v] [-h]
-+tdbbackup [-s suffix] [-v] [-h]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/testparm.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/testparm.1
-+++ samba-3.0.28/docs/manpages/testparm.1
-@@ -22,7 +22,7 @@
- testparm - check an smb.conf configuration file for internal correctness
- .SH "SYNOPSIS"
- .HP 1
--testparm [-s] [-h] [-v] [-L <servername>] [-t <encoding>] {config filename} [hostname hostIP]
-+testparm [-s] [-h] [-v] [-L <servername>] [-t <encoding>] {config filename} [hostname hostIP]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/vfstest.1
-===================================================================
---- samba-3.0.28.orig/docs/manpages/vfstest.1
-+++ samba-3.0.28/docs/manpages/vfstest.1
-@@ -22,7 +22,7 @@
- vfstest - tool for testing samba VFS modules
- .SH "SYNOPSIS"
- .HP 1
--vfstest [-d debuglevel] [-c command] [-l logdir] [-h]
-+vfstest [-d debuglevel] [-c command] [-l logdir] [-h]
- .SH "DESCRIPTION"
- .PP
- This tool is part of the
-Index: samba-3.0.28/docs/manpages/winbindd.8
-===================================================================
---- samba-3.0.28.orig/docs/manpages/winbindd.8
-+++ samba-3.0.28/docs/manpages/winbindd.8
-@@ -22,7 +22,7 @@
- winbindd - Name Service Switch daemon for resolving names from NT servers
- .SH "SYNOPSIS"
- .HP 1
--winbindd [-F] [-S] [-i] [-Y] [-d <debug level>] [-s <smb config file>] [-n]
-+winbindd [-F] [-S] [-i] [-Y] [-d <debug level>] [-s <smb config file>] [-n]
- .SH "DESCRIPTION"
- .PP
- This program is part of the
Modified: trunk/samba/debian/patches/non-linux-ports.patch
===================================================================
--- trunk/samba/debian/patches/non-linux-ports.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/non-linux-ports.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -7,10 +7,10 @@
Note: Upstream would probably welcome patches allowing to build on new architectures.
As this patch is the most often broken by new upstream releases, everybody would benefit from it.
-Index: samba-3.0.28a/source/configure.in
+Index: samba-3.0.29/source/configure.in
===================================================================
---- samba-3.0.28a.orig/source/configure.in
-+++ samba-3.0.28a/source/configure.in
+--- samba-3.0.29.orig/source/configure.in
++++ samba-3.0.29/source/configure.in
@@ -769,6 +769,15 @@
fi
;;
Modified: trunk/samba/debian/patches/pam-examples.patch
===================================================================
--- trunk/samba/debian/patches/pam-examples.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/pam-examples.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.0.28a/source/pam_smbpass/README
+Index: samba-3.0.29/source/pam_smbpass/README
===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/README
-+++ samba-3.0.28a/source/pam_smbpass/README
+--- samba-3.0.29.orig/source/pam_smbpass/README
++++ samba-3.0.29/source/pam_smbpass/README
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/series 2008-05-22 12:11:01 UTC (rev 1887)
@@ -15,4 +15,3 @@
smbpasswd-syslog.patch
usershare.patch
disable-weak-auth.patch
-manpage-encoding.patch
Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/smbclient-pager.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -8,10 +8,10 @@
Note:
-Index: samba-3.0.28a/source/include/local.h
+Index: samba-3.0.29/source/include/local.h
===================================================================
---- samba-3.0.28a.orig/source/include/local.h
-+++ samba-3.0.28a/source/include/local.h
+--- samba-3.0.29.orig/source/include/local.h
++++ samba-3.0.29/source/include/local.h
@@ -109,7 +109,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
Modified: trunk/samba/debian/patches/smbpasswd-syslog.patch
===================================================================
--- trunk/samba/debian/patches/smbpasswd-syslog.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/smbpasswd-syslog.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -4,10 +4,10 @@
Upstream status: submitted as bugzilla bug #4831
-Index: samba-3.0.28a/source/pam_smbpass/support.c
+Index: samba-3.0.29/source/pam_smbpass/support.c
===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/support.c
-+++ samba-3.0.28a/source/pam_smbpass/support.c
+--- samba-3.0.29.orig/source/pam_smbpass/support.c
++++ samba-3.0.29/source/pam_smbpass/support.c
@@ -15,6 +15,7 @@
* Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -292,10 +292,10 @@
}
make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
"No password supplied" : "Password unchanged" );
-Index: samba-3.0.28a/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.0.29/source/pam_smbpass/pam_smb_auth.c
===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.0.28a/source/pam_smbpass/pam_smb_auth.c
+--- samba-3.0.29.orig/source/pam_smbpass/pam_smb_auth.c
++++ samba-3.0.29/source/pam_smbpass/pam_smb_auth.c
@@ -75,10 +75,9 @@
/* Samba initialization. */
@@ -369,10 +369,10 @@
return PAM_AUTHTOK_RECOVER_ERR;
} else if (pass == NULL) {
return PAM_AUTHTOK_RECOVER_ERR;
-Index: samba-3.0.28a/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.0.29/source/pam_smbpass/pam_smb_acct.c
===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.0.28a/source/pam_smbpass/pam_smb_acct.c
+--- samba-3.0.29.orig/source/pam_smbpass/pam_smb_acct.c
++++ samba-3.0.29/source/pam_smbpass/pam_smb_acct.c
@@ -52,22 +52,21 @@
/* Samba initialization. */
@@ -428,10 +428,10 @@
}
make_remark( pamh, ctrl, PAM_ERROR_MSG
, "Your account has been disabled; "
-Index: samba-3.0.28a/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.0.29/source/pam_smbpass/pam_smb_passwd.c
===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.0.28a/source/pam_smbpass/pam_smb_passwd.c
+--- samba-3.0.29.orig/source/pam_smbpass/pam_smb_passwd.c
++++ samba-3.0.29/source/pam_smbpass/pam_smb_passwd.c
@@ -104,10 +104,9 @@
/* Samba initialization. */
@@ -563,10 +563,10 @@
retval = PAM_ABORT;
}
-Index: samba-3.0.28a/source/pam_smbpass/support.h
+Index: samba-3.0.29/source/pam_smbpass/support.h
===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/support.h
-+++ samba-3.0.28a/source/pam_smbpass/support.h
+--- samba-3.0.29.orig/source/pam_smbpass/support.h
++++ samba-3.0.29/source/pam_smbpass/support.h
@@ -1,8 +1,8 @@
/* syslogging function for errors and other information */
-extern void _log_err(int, const char *, ...);
Modified: trunk/samba/debian/patches/smbstatus-locking.patch
===================================================================
--- trunk/samba/debian/patches/smbstatus-locking.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/smbstatus-locking.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -7,10 +7,10 @@
Note:
-Index: samba-3.0.28a/source/utils/status.c
+Index: samba-3.0.29/source/utils/status.c
===================================================================
---- samba-3.0.28a.orig/source/utils/status.c
-+++ samba-3.0.28a/source/utils/status.c
+--- samba-3.0.29.orig/source/utils/status.c
++++ samba-3.0.29/source/utils/status.c
@@ -377,6 +377,16 @@
tdb_close(tdb);
}
Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/undefined-symbols.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -9,10 +9,10 @@
Note:
-Index: samba-3.0.28a/source/Makefile.in
+Index: samba-3.0.29/source/Makefile.in
===================================================================
---- samba-3.0.28a.orig/source/Makefile.in
-+++ samba-3.0.28a/source/Makefile.in
+--- samba-3.0.29.orig/source/Makefile.in
++++ samba-3.0.29/source/Makefile.in
@@ -1161,7 +1161,7 @@
bin/libsmbclient. at SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
Modified: trunk/samba/debian/patches/usershare.patch
===================================================================
--- trunk/samba/debian/patches/usershare.patch 2008-05-22 11:51:59 UTC (rev 1886)
+++ trunk/samba/debian/patches/usershare.patch 2008-05-22 12:11:01 UTC (rev 1887)
@@ -8,106 +8,89 @@
Status wrt upstream: Debian-specific
-Index: samba-3.0.28a/docs/manpages/smb.conf.5
+Index: samba-3.0.29/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.28a.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.28a/docs/manpages/smb.conf.5
-@@ -253,7 +253,7 @@
- .PP
- usershare path
- .RS 3n
--Points to the directory containing the user defined share definitions. The filesystem permissions on this directory control who can create user defined shares.
-+Points to the directory containing the user-defined share definitions. The filesystem permissions on this directory control who can create user-defined shares.
+--- samba-3.0.29.orig/docs/manpages/smb.conf.5
++++ samba-3.0.29/docs/manpages/smb.conf.5
+@@ -287,31 +287,7 @@
+ Names a pre\-existing share used as a template for creating new usershares\. All other share parameters not specified in the user defined share definition are copied from this named share\.
.RE
.PP
- usershare prefix allow list
-@@ -271,32 +271,7 @@
- Names a pre-existing share used as a template for creating new usershares. All other share parameters not specified in the user defined share definition are copied from this named share.
- .RE
- .PP
-To allow members of the UNIX group
-foo
-to create user defined shares, create the directory to contain the share definitions as follows:
-.PP
-Become root:
--
+-.sp
+-.RS 4
-.nf
--
-mkdir /usr/local/samba/lib/usershares
-chgrp foo /usr/local/samba/lib/usershares
-chmod 1770 /usr/local/samba/lib/usershares
--
-.fi
+-.RE
-.PP
-Then add the parameters
--
-.sp
--
+-.RS 4
-.nf
--
-- usershare path = /usr/local/samba/lib/usershares
-- usershare max shares = 10 # (or the desired number of shares)
--
+- \fIusershare path = /usr/local/samba/lib/usershares\fR
+- \fIusershare max shares = 10\fR # (or the desired number of shares)
-.fi
+-.RE
+-.sp
-to the global section of your
--\fIsmb.conf\fR. Members of the group foo may then manipulate the user defined shares using the following commands.
-+Members of the \fBsambashare\fR group can manipulate the user-defined shares using the following commands:
+-\fIsmb\.conf\fR\. Members of the group foo may then manipulate the user defined shares using the following commands\.
++Members of the \fBsambashare\fR group can manipulate the user defined shares using the following commands:
.PP
net usershare add sharename path [comment] [acl] [guest_ok=[y|n]]
- .RS 3n
-@@ -6964,9 +6939,9 @@
- .PP
- usershare path (G)
- .RS 3n
--This parameter specifies the absolute path of the directory on the filesystem used to store the user defined share definition files. This directory must be owned by root, and have no access for other, and be writable only by the group owner. In addition the "sticky" bit must also be set, restricting rename and delete to owners of a file (in the same way the /tmp directory is usually configured). Members of the group owner of this directory are the users allowed to create usershares. If this parameter is undefined then no user defined shares are allowed.
-+This parameter specifies the absolute path of the directory on the filesystem used to store the user-defined share definition files. This directory must be owned by root, and have no access for other, and be writable only by the group owner. In addition the "sticky" bit must also be set, restricting rename and delete to owners of a file (in the same way the /tmp directory is usually configured). Members of the group owner of this directory are the users allowed to create usershares. If this parameter is undefined then no user-defined shares are allowed.
+ .RS 4
+@@ -8503,23 +8479,23 @@
+ .RS 4
+ This parameter specifies the absolute path of the directory on the filesystem used to store the user defined share definition files\. This directory must be owned by root, and have no access for other, and be writable only by the group owner\. In addition the "sticky" bit must also be set, restricting rename and delete to owners of a file (in the same way the /tmp directory is usually configured)\. Members of the group owner of this directory are the users allowed to create usershares\. If this parameter is undefined then no user defined shares are allowed\.
.sp
--For example, a valid usershare directory might be /usr/local/samba/lib/usershares, set up as follows.
+-For example, a valid usershare directory might be /usr/local/samba/lib/usershares, set up as follows\.
+For example, on Debian the default usershare directory of /var/lib/samba/usershares is set up as follows.
.sp
-
-@@ -6974,16 +6949,16 @@
-
+ .sp
+ .RS 4
.nf
-
-- ls -ld /usr/local/samba/lib/usershares/
-- drwxrwx--T 2 root power_users 4096 2006-05-05 12:27 /usr/local/samba/lib/usershares/
-+ ls -ld /var/lib/samba/usershares/
-+ drwxrwx--T 2 root sambashare 4096 2006-05-05 12:27 /var/lib/samba/usershares/
+- ls \-ld /usr/local/samba/lib/usershares/
+- drwxrwx\-\-T 2 root power_users 4096 2006\-05\-05 12:27 /usr/local/samba/lib/usershares/
++ ls \-ld /var/lib/samba/usershares/
++ drwxrwx\-\-T 2 root sambashare 4096 2006\-05\-05 12:27 /var/lib/samba/usershares/
.fi
-
+ .RE
.sp
--In this case, only members of the group "power_users" can create user defined shares.
+ .sp
+-In this case, only members of the group "power_users" can create user defined shares\.
+In this case, only members of the group "sambashare" can create user defined shares.
.sp
Default:
--\fB\fIusershare path\fR = NULL \fR
+-\fI\fIusershare path\fR\fR\fI = \fR\fINULL\fR\fI \fR
+\fB\fIusershare path\fR = /var/lib/samba/usershares \fR
.RE
- .PP
+
usershare prefix allow list (G)
-Index: samba-3.0.28a/docs/manpages/net.8
+Index: samba-3.0.29/docs/manpages/net.8
===================================================================
---- samba-3.0.28a.orig/docs/manpages/net.8
-+++ samba-3.0.28a/docs/manpages/net.8
-@@ -675,9 +675,9 @@
- Store a secret for the sepcified domain, used primarily for domains that use idmap_ldap as a backend. In this case the secret is used as the password for the user DN used to bind to the ldap server.
- .SS "USERSHARE"
+--- samba-3.0.29.orig/docs/manpages/net.8
++++ samba-3.0.29/docs/manpages/net.8
+@@ -662,7 +662,7 @@
.PP
--Starting with version 3.0.23, a Samba server now supports the ability for non-root users to add user define shares to be exported using the "net usershare" commands.
-+Starting with version 3.0.23, a Samba server now supports the ability for non-root users to add user-defined shares to be exported using the "net usershare" commands.
+ Starting with version 3\.0\.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\.
.PP
--To set this up, first set up your smb.conf by adding to the [global] section : usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops". Set the permissions on /usr/local/samba/lib/usershares to 01770. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file). Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb.conf a line such as : usershare max shares = 100. To allow 100 usershare definitions. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below.
-+Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below.
+-To set this up, first set up your smb\.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\. Set the permissions on /usr/local/samba/lib/usershares to 01770\. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file)\. Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb\.conf a line such as : usershare max shares = 100\. To allow 100 usershare definitions\. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below\.
++Members of the UNIX group "sambashare" can create user defined shares on demand using the commands below.
.PP
The usershare commands are:
- .IP "" 3n
-Index: samba-3.0.28a/source/param/loadparm.c
+ .IP "" 4
+Index: samba-3.0.29/source/param/loadparm.c
===================================================================
---- samba-3.0.28a.orig/source/param/loadparm.c
-+++ samba-3.0.28a/source/param/loadparm.c
+--- samba-3.0.29.orig/source/param/loadparm.c
++++ samba-3.0.29/source/param/loadparm.c
@@ -1689,7 +1689,7 @@
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
@@ -117,10 +100,10 @@
/* By default disallow sharing of directories not owned by the sharer. */
Globals.bUsershareOwnerOnly = True;
/* By default disallow guest access to usershares. */
-Index: samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
+Index: samba-3.0.29/docs/htmldocs/manpages/smb.conf.5.html
===================================================================
---- samba-3.0.28a.orig/docs/htmldocs/manpages/smb.conf.5.html
-+++ samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
+--- samba-3.0.29.orig/docs/htmldocs/manpages/smb.conf.5.html
++++ samba-3.0.29/docs/htmldocs/manpages/smb.conf.5.html
@@ -164,8 +164,8 @@
their own share definitions has been added. This capability is called <span class="emphasis"><em>usershares</em></span> and
is controlled by a set of parameters in the [global] section of the smb.conf.
@@ -132,74 +115,3 @@
can be shared. Only directories below the pathnames in this list are permitted.</p></dd><dt><span class="term">usershare prefix deny list</span></dt><dd><p>Comma-separated list of absolute pathnames restricting what directories
can be shared. Directories below the pathnames in this list are prohibited.</p></dd><dt><span class="term">usershare template share</span></dt><dd><p>Names a pre-existing share used as a template for creating new usershares.
All other share parameters not specified in the user defined share definition
-@@ -4509,25 +4509,25 @@
- </p><p>Default: <span class="emphasis"><em><em class="parameter"><code>usershare owner only</code></em> = <code class="literal">True</code>
- </em></span>
- </p></dd><dt><span class="term"><a name="USERSHAREPATH"></a>usershare path (G)</span></dt><dd><p>This parameter specifies the absolute path of the directory on the
-- filesystem used to store the user defined share definition files.
-+ filesystem used to store the user-defined share definition files.
- This directory must be owned by root, and have no access for
- other, and be writable only by the group owner. In addition the
- "sticky" bit must also be set, restricting rename and delete to
- owners of a file (in the same way the /tmp directory is usually configured).
- Members of the group owner of this directory are the users allowed to create
-- usershares. If this parameter is undefined then no user defined
-+ usershares. If this parameter is undefined then no user-defined
- shares are allowed.
- </p><p>
-- For example, a valid usershare directory might be /usr/local/samba/lib/usershares,
-- set up as follows.
-+ For example, on Debian the default usershare directory of
-+ /var/lib/samba/usershares is set up as follows.
- </p><p>
- </p><pre class="programlisting">
-- ls -ld /usr/local/samba/lib/usershares/
-- drwxrwx--T 2 root power_users 4096 2006-05-05 12:27 /usr/local/samba/lib/usershares/
-+ ls -ld /var/lib/samba/usershares/
-+ drwxrwx--T 2 root sambashare 4096 2006-05-05 12:27 /var/lib/samba/usershares/
- </pre><p>
- </p><p>
-- In this case, only members of the group "power_users" can create user defined shares.
-- </p><p>Default: <span class="emphasis"><em><em class="parameter"><code>usershare path</code></em> = <code class="literal">NULL</code>
-+ In this case, only members of the group "sambashare" can create user defined shares.
-+ </p><p>Default: <span class="emphasis"><em><em class="parameter"><code>usershare path</code></em> = <code class="literal">/var/lib/samba/usershares</code>
- </em></span>
- </p></dd><dt><span class="term"><a name="USERSHAREPREFIXALLOWLIST"></a>usershare prefix allow list (G)</span></dt><dd><p>This parameter specifies a list of absolute pathnames
- the root of which are allowed to be exported by user defined share definitions.
-Index: samba-3.0.28a/docs/htmldocs/manpages/net.8.html
-===================================================================
---- samba-3.0.28a.orig/docs/htmldocs/manpages/net.8.html
-+++ samba-3.0.28a/docs/htmldocs/manpages/net.8.html
-@@ -249,30 +249,10 @@
- that use idmap_ldap as a backend. In this case the secret is used
- as the password for the user DN used to bind to the ldap server.
- </p></div><div class="refsect2" lang="en"><a name="id302073"></a><h3>USERSHARE</h3><p>Starting with version 3.0.23, a Samba server now supports the ability for
--non-root users to add user define shares to be exported using the "net usershare"
-+non-root users to add user-defined shares to be exported using the "net usershare"
- commands.
- </p><p>
--To set this up, first set up your smb.conf by adding to the [global] section :
--
--usershare path = /usr/local/samba/lib/usershares
--
--Next create the directory /usr/local/samba/lib/usershares, change the owner to root and
--set the group owner to the UNIX group who should have the ability to create usershares,
--for example a group called "serverops".
--
--Set the permissions on /usr/local/samba/lib/usershares to 01770.
--
--(Owner and group all access, no access for others, plus the sticky bit,
--which means that a file in that directory can be renamed or deleted only
--by the owner of the file).
--
--Finally, tell smbd how many usershares you will allow by adding to the [global]
--section of smb.conf a line such as :
--
--usershare max shares = 100.
--
--To allow 100 usershare definitions. Now, members of the UNIX group "serverops"
--can create user defined shares on demand using the commands below.
-+Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below.
- </p><p>The usershare commands are:
-
- </p><table class="simplelist" border="0" summary="Simple list"><tr><td>net usershare add sharename path [comment] [acl] [guest_ok=[y|n]] - to add or change a user defined share.</td></tr><tr><td>net usershare delete sharename - to delete a user defined share.</td></tr><tr><td>net usershare info [-l|--long] [wildcard sharename] - to print info about a user defined share.</td></tr><tr><td>net usershare list [-l|--long] [wildcard sharename] - to list user defined shares.</td></tr></table><p>
More information about the Pkg-samba-maint
mailing list