summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubulle <bubulle@alioth.debian.org>2008-03-09 09:58:03 +0000
committerbubulle <bubulle@alioth.debian.org>2008-03-09 09:58:03 +0000
commit1205abd22d25187059469f814ba535d6313dd211 (patch)
tree81172c341c915224eef4b8b49b4d760361f11a0e
parente85cca6bd7c8fe5afd2a2392fc271755fc9ed363 (diff)
downloadsamba-1205abd22d25187059469f814ba535d6313dd211.tar.gz
Refresh patches wrt 3.0.28a
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1754 fc4039ab-9d04-0410-8cac-899223bdd6b0
-rw-r--r--patches/README_nosmbldap-tools.patch6
-rw-r--r--patches/VERSION.patch6
-rw-r--r--patches/adapt_machine_creation_script.patch6
-rw-r--r--patches/cups.patch14
-rw-r--r--patches/disable-weak-auth.patch20
-rw-r--r--patches/documentation.patch42
-rw-r--r--patches/fhs-assignpaths.patch6
-rw-r--r--patches/fhs-filespaths.patch148
-rw-r--r--patches/fhs-newpaths.patch30
-rw-r--r--patches/gcc42-arm-workaround.patch6
-rw-r--r--patches/installswat.sh.patch6
-rw-r--r--patches/non-linux-ports.patch10
-rw-r--r--patches/pam-examples.patch6
-rw-r--r--patches/smbclient-pager.patch6
-rw-r--r--patches/smbstatus-locking.patch12
-rw-r--r--patches/undefined-symbols.patch6
-rw-r--r--patches/usershare.patch32
17 files changed, 181 insertions, 181 deletions
diff --git a/patches/README_nosmbldap-tools.patch b/patches/README_nosmbldap-tools.patch
index ce3d94e9ab..dbe40a024c 100644
--- a/patches/README_nosmbldap-tools.patch
+++ b/patches/README_nosmbldap-tools.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
Note:
-Index: samba-3.0.25c/examples/LDAP/README
+Index: samba-3.0.28a/examples/LDAP/README
===================================================================
---- samba-3.0.25c.orig/examples/LDAP/README 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/examples/LDAP/README 2007-08-26 13:09:02.419701485 +0200
+--- samba-3.0.28a.orig/examples/LDAP/README
++++ samba-3.0.28a/examples/LDAP/README
@@ -59,6 +59,9 @@
The smbldap-tools package can be downloaded individually from
http://samba.idealx.org/dist/
diff --git a/patches/VERSION.patch b/patches/VERSION.patch
index 8b46f886fc..8bfb40924d 100644
--- a/patches/VERSION.patch
+++ b/patches/VERSION.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
Note: Should be kept
-Index: samba-3.0.28/source/VERSION
+Index: samba-3.0.28a/source/VERSION
===================================================================
---- samba-3.0.28.orig/source/VERSION
-+++ samba-3.0.28/source/VERSION
+--- samba-3.0.28a.orig/source/VERSION
++++ samba-3.0.28a/source/VERSION
@@ -95,5 +95,5 @@
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
diff --git a/patches/adapt_machine_creation_script.patch b/patches/adapt_machine_creation_script.patch
index 4af9cd230f..d471657c40 100644
--- a/patches/adapt_machine_creation_script.patch
+++ b/patches/adapt_machine_creation_script.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
Note:
-Index: samba-3.0.25c/docs/manpages/smb.conf.5
+Index: samba-3.0.28a/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.25c.orig/docs/manpages/smb.conf.5 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/docs/manpages/smb.conf.5 2007-08-26 13:09:05.419555107 +0200
+--- samba-3.0.28a.orig/docs/manpages/smb.conf.5
++++ samba-3.0.28a/docs/manpages/smb.conf.5
@@ -662,8 +662,8 @@
Default:
\fB\fIadd machine script\fR = \fR
diff --git a/patches/cups.patch b/patches/cups.patch
index 0bca7c2ac2..df578094bf 100644
--- a/patches/cups.patch
+++ b/patches/cups.patch
@@ -5,10 +5,10 @@ Author: Steve Langasek <vorlon@debian.org>
Upstream status: submitted as bugzilla bug #5101
-Index: samba-3.0.27a/source/include/includes.h
+Index: samba-3.0.28a/source/include/includes.h
===================================================================
---- samba-3.0.27a.orig/source/include/includes.h
-+++ samba-3.0.27a/source/include/includes.h
+--- samba-3.0.28a.orig/source/include/includes.h
++++ samba-3.0.28a/source/include/includes.h
@@ -54,19 +54,6 @@
#include "local.h"
@@ -29,7 +29,7 @@ Index: samba-3.0.27a/source/include/includes.h
#ifdef SUNOS4
/* on SUNOS4 termios.h conflicts with sys/ioctl.h */
#undef HAVE_TERMIOS_H
-@@ -810,23 +797,6 @@
+@@ -809,23 +796,6 @@
#define QSORT_CAST (int (*)(const void *, const void *))
#endif
@@ -53,10 +53,10 @@ Index: samba-3.0.27a/source/include/includes.h
#ifndef SIGCLD
#define SIGCLD SIGCHLD
#endif
-Index: samba-3.0.27a/source/lib/replace/system/printing.h
+Index: samba-3.0.28a/source/lib/replace/system/printing.h
===================================================================
---- samba-3.0.27a.orig/source/lib/replace/system/printing.h
-+++ samba-3.0.27a/source/lib/replace/system/printing.h
+--- samba-3.0.28a.orig/source/lib/replace/system/printing.h
++++ samba-3.0.28a/source/lib/replace/system/printing.h
@@ -37,8 +37,18 @@
#endif
diff --git a/patches/disable-weak-auth.patch b/patches/disable-weak-auth.patch
index 44395bf876..caabdc548b 100644
--- a/patches/disable-weak-auth.patch
+++ b/patches/disable-weak-auth.patch
@@ -7,11 +7,11 @@ Fixes: LP #163194
Upstream status: pulled from upstream 3.2 git tree, will be superseded
with first release of 3.2
-Index: samba-3.0.27a/source/param/loadparm.c
+Index: samba-3.0.28a/source/param/loadparm.c
===================================================================
---- samba-3.0.27a.orig/source/param/loadparm.c
-+++ samba-3.0.27a/source/param/loadparm.c
-@@ -1562,9 +1562,9 @@
+--- samba-3.0.28a.orig/source/param/loadparm.c
++++ samba-3.0.28a/source/param/loadparm.c
+@@ -1572,9 +1572,9 @@
Globals.bStatCache = True; /* use stat cache by default */
Globals.iMaxStatCacheSize = 1024; /* one Meg by default. */
Globals.restrict_anonymous = 0;
@@ -24,10 +24,10 @@ Index: samba-3.0.27a/source/param/loadparm.c
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.27a/docs/htmldocs/manpages/smb.conf.5.html
+Index: samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
===================================================================
---- samba-3.0.27a.orig/docs/htmldocs/manpages/smb.conf.5.html
-+++ samba-3.0.27a/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 @@
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
@@ -55,10 +55,10 @@ Index: samba-3.0.27a/docs/htmldocs/manpages/smb.conf.5.html
</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.27a/docs/manpages/smb.conf.5
+Index: samba-3.0.28a/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.27a.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.27a/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.
.sp
diff --git a/patches/documentation.patch b/patches/documentation.patch
index 01d96a1773..024d045d4f 100644
--- a/patches/documentation.patch
+++ b/patches/documentation.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
Note: Some part should maybe go in the FHS patch
-Index: samba-3.0.25c/docs/manpages/swat.8
+Index: samba-3.0.28a/docs/manpages/swat.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/swat.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/swat.8 2007-08-26 13:08:58.919872259 +0200
+--- 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.
@@ -88,10 +88,10 @@ Index: samba-3.0.25c/docs/manpages/swat.8
.RE
.SH "WARNINGS"
.PP
-Index: samba-3.0.25c/docs/manpages/nmbd.8
+Index: samba-3.0.28a/docs/manpages/nmbd.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/nmbd.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/nmbd.8 2007-08-26 13:08:58.919872259 +0200
+--- 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.
@@ -137,10 +137,10 @@ Index: samba-3.0.25c/docs/manpages/nmbd.8
nmbd
to dump out its server database in the
\fIlog.nmb\fR
-Index: samba-3.0.25c/docs/manpages/smbd.8
+Index: samba-3.0.28a/docs/manpages/smbd.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/smbd.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/smbd.8 2007-08-26 13:08:58.919872259 +0200
+--- 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).
.RE
@@ -158,10 +158,10 @@ Index: samba-3.0.25c/docs/manpages/smbd.8
.sp
This file describes all the services the server is to make available to clients. See
\fBsmb.conf\fR(5)
-Index: samba-3.0.25c/docs/manpages/lmhosts.5
+Index: samba-3.0.28a/docs/manpages/lmhosts.5
===================================================================
---- samba-3.0.25c.orig/docs/manpages/lmhosts.5 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/lmhosts.5 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/lmhosts.5
++++ samba-3.0.28a/docs/manpages/lmhosts.5
@@ -77,10 +77,8 @@
file.
.SH "FILES"
@@ -175,10 +175,10 @@ Index: samba-3.0.25c/docs/manpages/lmhosts.5
.SH "VERSION"
.PP
This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25c/docs/manpages/ntlm_auth.1
+Index: samba-3.0.28a/docs/manpages/ntlm_auth.1
===================================================================
---- samba-3.0.25c.orig/docs/manpages/ntlm_auth.1 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/ntlm_auth.1 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/ntlm_auth.1
++++ samba-3.0.28a/docs/manpages/ntlm_auth.1
@@ -43,7 +43,7 @@
Some of these commands also require access to the directory
\fIwinbindd_privileged\fR
@@ -206,10 +206,10 @@ Index: samba-3.0.25c/docs/manpages/ntlm_auth.1
.RE
.PP
gss-spnego-client
-Index: samba-3.0.25c/docs/manpages/tdbbackup.8
+Index: samba-3.0.28a/docs/manpages/tdbbackup.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/tdbbackup.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/tdbbackup.8 2007-08-26 13:08:58.919872259 +0200
+--- samba-3.0.28a.orig/docs/manpages/tdbbackup.8
++++ samba-3.0.28a/docs/manpages/tdbbackup.8
@@ -70,17 +70,17 @@
\(bu
@@ -231,10 +231,10 @@ Index: samba-3.0.25c/docs/manpages/tdbbackup.8
.SH "VERSION"
.PP
This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25c/docs/manpages/winbindd.8
+Index: samba-3.0.28a/docs/manpages/winbindd.8
===================================================================
---- samba-3.0.25c.orig/docs/manpages/winbindd.8 2007-08-26 13:07:03.425508276 +0200
-+++ samba-3.0.25c/docs/manpages/winbindd.8 2007-08-26 13:08:58.919872259 +0200
+--- 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.
.RE
diff --git a/patches/fhs-assignpaths.patch b/patches/fhs-assignpaths.patch
index bd96c0e47a..69fe8ee432 100644
--- a/patches/fhs-assignpaths.patch
+++ b/patches/fhs-assignpaths.patch
@@ -7,10 +7,10 @@ Fixes: #49011
Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
change their default behaviour
-Index: samba-3.0.27a/source/configure.in
+Index: samba-3.0.28a/source/configure.in
===================================================================
---- samba-3.0.27a.orig/source/configure.in
-+++ samba-3.0.27a/source/configure.in
+--- samba-3.0.28a.orig/source/configure.in
++++ samba-3.0.28a/source/configure.in
@@ -51,7 +51,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
diff --git a/patches/fhs-filespaths.patch b/patches/fhs-filespaths.patch
index 0eeb6eaded..7946e51a0c 100644
--- a/patches/fhs-filespaths.patch
+++ b/patches/fhs-filespaths.patch
@@ -45,10 +45,10 @@ Note: Use dedicated directories for:
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.27a/source/intl/lang_tdb.c
+Index: samba-3.0.28a/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.27a.orig/source/intl/lang_tdb.c
-+++ samba-3.0.27a/source/intl/lang_tdb.c
+--- samba-3.0.28a.orig/source/intl/lang_tdb.c
++++ samba-3.0.28a/source/intl/lang_tdb.c
@@ -131,7 +131,7 @@
if (!lang)
return True;
@@ -58,10 +58,10 @@ Index: samba-3.0.27a/source/intl/lang_tdb.c
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.27a/source/lib/util_unistr.c
+Index: samba-3.0.28a/source/lib/util_unistr.c
===================================================================
---- samba-3.0.27a.orig/source/lib/util_unistr.c
-+++ samba-3.0.27a/source/lib/util_unistr.c
+--- samba-3.0.28a.orig/source/lib/util_unistr.c
++++ samba-3.0.28a/source/lib/util_unistr.c
@@ -88,11 +88,11 @@
}
initialised = 1;
@@ -85,10 +85,10 @@ Index: samba-3.0.27a/source/lib/util_unistr.c
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-Index: samba-3.0.27a/source/libsmb/samlogon_cache.c
+Index: samba-3.0.28a/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.27a.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.0.27a/source/libsmb/samlogon_cache.c
+--- samba-3.0.28a.orig/source/libsmb/samlogon_cache.c
++++ samba-3.0.28a/source/libsmb/samlogon_cache.c
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -107,10 +107,10 @@ Index: samba-3.0.27a/source/libsmb/samlogon_cache.c
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
-Index: samba-3.0.27a/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.28a/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.27a.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.0.27a/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.28a.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.0.28a/source/nmbd/nmbd_serverlistdb.c
@@ -325,7 +325,7 @@
updatecount++;
@@ -120,10 +120,10 @@ Index: samba-3.0.27a/source/nmbd/nmbd_serverlistdb.c
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.27a/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.28a/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.27a.orig/source/nmbd/nmbd_winsserver.c
-+++ samba-3.0.27a/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.28a.orig/source/nmbd/nmbd_winsserver.c
++++ samba-3.0.28a/source/nmbd/nmbd_winsserver.c
@@ -585,7 +585,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -142,10 +142,10 @@ Index: samba-3.0.27a/source/nmbd/nmbd_winsserver.c
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-Index: samba-3.0.27a/source/passdb/login_cache.c
+Index: samba-3.0.28a/source/passdb/login_cache.c
===================================================================
---- samba-3.0.27a.orig/source/passdb/login_cache.c
-+++ samba-3.0.27a/source/passdb/login_cache.c
+--- samba-3.0.28a.orig/source/passdb/login_cache.c
++++ samba-3.0.28a/source/passdb/login_cache.c
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -155,10 +155,10 @@ Index: samba-3.0.27a/source/passdb/login_cache.c
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.0.27a/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.28a/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.27a.orig/source/nsswitch/winbindd_cache.c
-+++ samba-3.0.27a/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 @@
return True;
@@ -189,10 +189,10 @@ Index: samba-3.0.27a/source/nsswitch/winbindd_cache.c
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.27a/source/param/loadparm.c
+Index: samba-3.0.28a/source/param/loadparm.c
===================================================================
---- samba-3.0.27a.orig/source/param/loadparm.c
-+++ samba-3.0.27a/source/param/loadparm.c
+--- samba-3.0.28a.orig/source/param/loadparm.c
++++ samba-3.0.28a/source/param/loadparm.c
@@ -108,6 +108,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -203,7 +203,7 @@ Index: samba-3.0.27a/source/param/loadparm.c
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -1200,8 +1203,13 @@
+@@ -1210,8 +1213,13 @@
{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
@@ -217,7 +217,7 @@ Index: samba-3.0.27a/source/param/loadparm.c
{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED},
#ifdef WITH_UTMP
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
-@@ -1664,7 +1672,7 @@
+@@ -1677,7 +1685,7 @@
Globals.bASUSupport = False;
/* User defined shares. */
@@ -226,10 +226,10 @@ Index: samba-3.0.27a/source/param/loadparm.c
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
string_set(&Globals.szUsershareTemplateShare, "");
-Index: samba-3.0.27a/source/passdb/secrets.c
+Index: samba-3.0.28a/source/passdb/secrets.c
===================================================================
---- samba-3.0.27a.orig/source/passdb/secrets.c
-+++ samba-3.0.27a/source/passdb/secrets.c
+--- samba-3.0.28a.orig/source/passdb/secrets.c
++++ samba-3.0.28a/source/passdb/secrets.c
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -240,10 +240,10 @@ Index: samba-3.0.27a/source/passdb/secrets.c
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.27a/source/printing/nt_printing.c
+Index: samba-3.0.28a/source/printing/nt_printing.c
===================================================================
---- samba-3.0.27a.orig/source/printing/nt_printing.c
-+++ samba-3.0.27a/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 @@
if (tdb_drivers)
@@ -288,10 +288,10 @@ Index: samba-3.0.27a/source/printing/nt_printing.c
pstrcat(printdb_path, sharename);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.27a/source/printing/printing.c
+Index: samba-3.0.28a/source/printing/printing.c
===================================================================
---- samba-3.0.27a.orig/source/printing/printing.c
-+++ samba-3.0.27a/source/printing/printing.c
+--- samba-3.0.28a.orig/source/printing/printing.c
++++ samba-3.0.28a/source/printing/printing.c
@@ -185,8 +185,8 @@
int services = lp_numservices();
int snum;
@@ -303,10 +303,10 @@ Index: samba-3.0.27a/source/printing/printing.c
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-Index: samba-3.0.27a/source/printing/printing_db.c
+Index: samba-3.0.28a/source/printing/printing_db.c
===================================================================
---- samba-3.0.27a.orig/source/printing/printing_db.c
-+++ samba-3.0.27a/source/printing/printing_db.c
+--- samba-3.0.28a.orig/source/printing/printing_db.c
++++ samba-3.0.28a/source/printing/printing_db.c
@@ -91,7 +91,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -316,10 +316,10 @@ Index: samba-3.0.27a/source/printing/printing_db.c
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.27a/source/smbd/lanman.c
+Index: samba-3.0.28a/source/smbd/lanman.c
===================================================================
---- samba-3.0.27a.orig/source/smbd/lanman.c
-+++ samba-3.0.27a/source/smbd/lanman.c
+--- samba-3.0.28a.orig/source/smbd/lanman.c
++++ samba-3.0.28a/source/smbd/lanman.c
@@ -1094,9 +1094,9 @@
BOOL local_list_only;
int i;
@@ -332,10 +332,10 @@ Index: samba-3.0.27a/source/smbd/lanman.c
return 0;
}
-Index: samba-3.0.27a/source/registry/reg_db.c
+Index: samba-3.0.28a/source/registry/reg_db.c
===================================================================
---- samba-3.0.27a.orig/source/registry/reg_db.c
-+++ samba-3.0.27a/source/registry/reg_db.c
+--- samba-3.0.28a.orig/source/registry/reg_db.c
++++ samba-3.0.28a/source/registry/reg_db.c
@@ -234,12 +234,12 @@
if ( tdb_reg )
return True;
@@ -366,10 +366,10 @@ Index: samba-3.0.27a/source/registry/reg_db.c
}
unbecome_root();
-Index: samba-3.0.27a/source/lib/account_pol.c
+Index: samba-3.0.28a/source/lib/account_pol.c
===================================================================
---- samba-3.0.27a.orig/source/lib/account_pol.c
-+++ samba-3.0.27a/source/lib/account_pol.c
+--- samba-3.0.28a.orig/source/lib/account_pol.c
++++ samba-3.0.28a/source/lib/account_pol.c
@@ -213,9 +213,9 @@
return True;
}
@@ -382,10 +382,10 @@ Index: samba-3.0.27a/source/lib/account_pol.c
if (!tdb) {
DEBUG(0,("Failed to open account policy database\n"));
return False;
-Index: samba-3.0.27a/source/registry/reg_perfcount.c
+Index: samba-3.0.28a/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.27a.orig/source/registry/reg_perfcount.c
-+++ samba-3.0.27a/source/registry/reg_perfcount.c
+--- samba-3.0.28a.orig/source/registry/reg_perfcount.c
++++ samba-3.0.28a/source/registry/reg_perfcount.c
@@ -46,7 +46,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -404,10 +404,10 @@ Index: samba-3.0.27a/source/registry/reg_perfcount.c
/* no registry keys; just create the perfmon directory */
-Index: samba-3.0.27a/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.28a/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.27a.orig/source/rpc_server/srv_eventlog_lib.c
-+++ samba-3.0.27a/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
@@ -67,7 +67,7 @@
{
fstring path;
@@ -426,10 +426,10 @@ Index: samba-3.0.27a/source/rpc_server/srv_eventlog_lib.c
if ( !directory_exist( eventlogdir, NULL ) )
mkdir( eventlogdir, 0755 );
-Index: samba-3.0.27a/source/passdb/pdb_tdb.c
+Index: samba-3.0.28a/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.27a.orig/source/passdb/pdb_tdb.c
-+++ samba-3.0.27a/source/passdb/pdb_tdb.c
+--- samba-3.0.28a.orig/source/passdb/pdb_tdb.c
++++ samba-3.0.28a/source/passdb/pdb_tdb.c
@@ -1559,7 +1559,7 @@
uint32 rid;
BOOL ret = False;
@@ -448,10 +448,10 @@ Index: samba-3.0.27a/source/passdb/pdb_tdb.c
pfile = tdbfile;
}
pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.27a/source/groupdb/mapping_tdb.c
+Index: samba-3.0.28a/source/groupdb/mapping_tdb.c
===================================================================
---- samba-3.0.27a.orig/source/groupdb/mapping_tdb.c
-+++ samba-3.0.27a/source/groupdb/mapping_tdb.c
+--- samba-3.0.28a.orig/source/groupdb/mapping_tdb.c
++++ samba-3.0.28a/source/groupdb/mapping_tdb.c
@@ -39,7 +39,7 @@
if (tdb)
return True;
@@ -461,10 +461,10 @@ Index: samba-3.0.27a/source/groupdb/mapping_tdb.c
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-Index: samba-3.0.27a/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.28a/source/nsswitch/idmap_tdb.c
===================================================================
---- samba-3.0.27a.orig/source/nsswitch/idmap_tdb.c
-+++ samba-3.0.27a/source/nsswitch/idmap_tdb.c
+--- samba-3.0.28a.orig/source/nsswitch/idmap_tdb.c
++++ samba-3.0.28a/source/nsswitch/idmap_tdb.c
@@ -247,7 +247,7 @@
}
@@ -474,10 +474,10 @@ Index: samba-3.0.27a/source/nsswitch/idmap_tdb.c
if (!tdbfile) {
DEBUG(0, ("Out of memory!\n"));
ret = NT_STATUS_NO_MEMORY;
-Index: samba-3.0.27a/source/utils/smbcontrol.c
+Index: samba-3.0.28a/source/utils/smbcontrol.c
===================================================================
---- samba-3.0.27a.orig/source/utils/smbcontrol.c
-+++ samba-3.0.27a/source/utils/smbcontrol.c
+--- samba-3.0.28a.orig/source/utils/smbcontrol.c
++++ samba-3.0.28a/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 @@ Index: samba-3.0.27a/source/utils/smbcontrol.c
return False;
}
-Index: samba-3.0.27a/source/lib/sharesec.c
+Index: samba-3.0.28a/source/lib/sharesec.c
===================================================================
---- samba-3.0.27a.orig/source/lib/sharesec.c
-+++ samba-3.0.27a/source/lib/sharesec.c
+--- samba-3.0.28a.orig/source/lib/sharesec.c
++++ samba-3.0.28a/source/lib/sharesec.c
@@ -47,10 +47,10 @@
return True;
}
@@ -524,10 +524,10 @@ Index: samba-3.0.27a/source/lib/sharesec.c
return False;
}
-Index: samba-3.0.27a/source/libgpo/gpo_fetch.c
+Index: samba-3.0.28a/source/libgpo/gpo_fetch.c
===================================================================
---- samba-3.0.27a.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.0.27a/source/libgpo/gpo_fetch.c
+--- samba-3.0.28a.orig/source/libgpo/gpo_fetch.c
++++ samba-3.0.28a/source/libgpo/gpo_fetch.c
@@ -60,7 +60,7 @@
return NT_STATUS_NO_MEMORY;
}
@@ -546,10 +546,10 @@ Index: samba-3.0.27a/source/libgpo/gpo_fetch.c
char *current_dir;
fstring tok;
-Index: samba-3.0.27a/source/nsswitch/idmap_cache.c
+Index: samba-3.0.28a/source/nsswitch/idmap_cache.c
===================================================================
---- samba-3.0.27a.orig/source/nsswitch/idmap_cache.c
-+++ samba-3.0.27a/source/nsswitch/idmap_cache.c
+--- samba-3.0.28a.orig/source/nsswitch/idmap_cache.c
++++ samba-3.0.28a/source/nsswitch/idmap_cache.c
@@ -55,7 +55,7 @@
return NULL;
}
diff --git a/patches/fhs-newpaths.patch b/patches/fhs-newpaths.patch
index 92c0077176..6d7eb63da0 100644
--- a/patches/fhs-newpaths.patch
+++ b/patches/fhs-newpaths.patch
@@ -10,10 +10,10 @@ Status wrt upstream: Mean to be forwarded upstream (a good rationale
Note: See fhs-filespaths for rationale about the meaning of the new
path variables
-Index: samba-3.0.27a/source/Makefile.in
+Index: samba-3.0.28a/source/Makefile.in
===================================================================
---- samba-3.0.27a.orig/source/Makefile.in
-+++ samba-3.0.27a/source/Makefile.in
+--- samba-3.0.28a.orig/source/Makefile.in
++++ samba-3.0.28a/source/Makefile.in
@@ -106,6 +106,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -50,10 +50,10 @@ Index: samba-3.0.27a/source/Makefile.in
installswat: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.27a/source/configure.in
+Index: samba-3.0.28a/source/configure.in
===================================================================
---- samba-3.0.27a.orig/source/configure.in
-+++ samba-3.0.27a/source/configure.in
+--- samba-3.0.28a.orig/source/configure.in
++++ samba-3.0.28a/source/configure.in
@@ -59,6 +59,10 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
@@ -75,10 +75,10 @@ Index: samba-3.0.27a/source/configure.in
AC_SUBST(rootsbindir)
AC_SUBST(pammodulesdir)
-Index: samba-3.0.27a/source/dynconfig.c
+Index: samba-3.0.28a/source/dynconfig.c
===================================================================
---- samba-3.0.27a.orig/source/dynconfig.c
-+++ samba-3.0.27a/source/dynconfig.c
+--- samba-3.0.28a.orig/source/dynconfig.c
++++ samba-3.0.28a/source/dynconfig.c
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -121,10 +121,10 @@ Index: samba-3.0.27a/source/dynconfig.c
+ return lp_lockdir();
+#endif
+}
-Index: samba-3.0.27a/source/include/dynconfig.h
+Index: samba-3.0.28a/source/include/dynconfig.h
===================================================================
---- samba-3.0.27a.orig/source/include/dynconfig.h
-+++ samba-3.0.27a/source/include/dynconfig.h
+--- samba-3.0.28a.orig/source/include/dynconfig.h
++++ samba-3.0.28a/source/include/dynconfig.h
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -138,10 +138,10 @@ Index: samba-3.0.27a/source/include/dynconfig.h
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-Index: samba-3.0.27a/source/lib/util.c
+Index: samba-3.0.28a/source/lib/util.c
===================================================================
---- samba-3.0.27a.orig/source/lib/util.c
-+++ samba-3.0.27a/source/lib/util.c
+--- samba-3.0.28a.orig/source/lib/util.c
++++ samba-3.0.28a/source/lib/util.c
@@ -2633,6 +2633,61 @@
}
diff --git a/patches/gcc42-arm-workaround.patch b/patches/gcc42-arm-workaround.patch
index b6ed4f7c87..6898fa38e1 100644
--- a/patches/gcc42-arm-workaround.patch
+++ b/patches/gcc42-arm-workaround.patch
@@ -7,10 +7,10 @@ Upstream status: Debian-specific; should be dropped as soon as bug
Author: Steve Langasek <vorlon@debian.org>
-Index: samba-3.0.28/source/Makefile.in
+Index: samba-3.0.28a/source/Makefile.in
===================================================================
---- samba-3.0.28.orig/source/Makefile.in
-+++ samba-3.0.28/source/Makefile.in
+--- samba-3.0.28a.orig/source/Makefile.in
++++ samba-3.0.28a/source/Makefile.in
@@ -914,6 +914,8 @@
mkdir "$$dir" || \
exec false; fi || exec false
diff --git a/patches/installswat.sh.patch b/patches/installswat.sh.patch
index 23f68a4d68..7167e5fe7c 100644
--- a/patches/installswat.sh.patch
+++ b/patches/installswat.sh.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
Note:
-Index: samba-3.0.25c/source/script/installswat.sh
+Index: samba-3.0.28a/source/script/installswat.sh
===================================================================
---- samba-3.0.25c.orig/source/script/installswat.sh 2007-08-26 12:07:17.098275313 +0200
-+++ samba-3.0.25c/source/script/installswat.sh 2007-08-26 13:09:01.419750278 +0200
+--- samba-3.0.28a.orig/source/script/installswat.sh
++++ samba-3.0.28a/source/script/installswat.sh
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
diff --git a/patches/non-linux-ports.patch b/patches/non-linux-ports.patch
index b290dafaad..14b69f41c4 100644
--- a/patches/non-linux-ports.patch
+++ b/patches/non-linux-ports.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Forwarded, will be in 3.0.26
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.27a/source/configure.in
+Index: samba-3.0.28a/source/configure.in
===================================================================
---- samba-3.0.27a.orig/source/configure.in
-+++ samba-3.0.27a/source/configure.in
+--- samba-3.0.28a.orig/source/configure.in
++++ samba-3.0.28a/source/configure.in
@@ -769,6 +769,15 @@
fi
;;
@@ -48,7 +48,7 @@ Index: samba-3.0.27a/source/configure.in
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5428,7 +5440,7 @@
+@@ -5467,7 +5479,7 @@
AC_MSG_RESULT(yes);
case "$host_os" in
@@ -57,7 +57,7 @@ Index: samba-3.0.27a/source/configure.in
AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
AC_TRY_LINK([#include <sys/sendfile.h>],
[\
-@@ -5733,11 +5745,11 @@
+@@ -5772,11 +5784,11 @@
SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
case "$host_os" in
diff --git a/patches/pam-examples.patch b/patches/pam-examples.patch
index aa9fa76d5a..a152eac493 100644
--- a/patches/pam-examples.patch
+++ b/patches/pam-examples.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
Note:
-Index: samba-3.0.25c/source/pam_smbpass/README
+Index: samba-3.0.28a/source/pam_smbpass/README
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/README 2007-08-26 12:07:16.598298995 +0200
-+++ samba-3.0.25c/source/pam_smbpass/README 2007-08-26 13:09:02.419701485 +0200
+--- samba-3.0.28a.orig/source/pam_smbpass/README
++++ samba-3.0.28a/source/pam_smbpass/README
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
diff --git a/patches/smbclient-pager.patch b/patches/smbclient-pager.patch
index 200fe23290..a0cbb09dac 100644
--- a/patches/smbclient-pager.patch
+++ b/patches/smbclient-pager.patch
@@ -8,10 +8,10 @@ Author: Steve Langasek <vorlon@debian.org>
Note:
-Index: samba-3.0.25c/source/include/local.h
+Index: samba-3.0.28a/source/include/local.h
===================================================================
---- samba-3.0.25c.orig/source/include/local.h 2007-08-26 12:07:16.098322677 +0200
-+++ samba-3.0.25c/source/include/local.h 2007-08-26 13:09:03.419652692 +0200
+--- samba-3.0.28a.orig/source/include/local.h
++++ samba-3.0.28a/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 */
diff --git a/patches/smbstatus-locking.patch b/patches/smbstatus-locking.patch
index 74f8af62c0..5ead59e775 100644
--- a/patches/smbstatus-locking.patch
+++ b/patches/smbstatus-locking.patch
@@ -7,13 +7,13 @@ Status wrt upstream: Should be forwarded
Note:
-Index: samba-3.0.25c/source/utils/status.c
+Index: samba-3.0.28a/source/utils/status.c
===================================================================
---- samba-3.0.25c.orig/source/utils/status.c 2007-08-26 12:07:15.598346358 +0200
-+++ samba-3.0.25c/source/utils/status.c 2007-08-26 13:09:04.419603900 +0200
-@@ -367,6 +367,16 @@
- if ( show_locks ) {
- int ret;
+--- samba-3.0.28a.orig/source/utils/status.c
++++ samba-3.0.28a/source/utils/status.c
+@@ -377,6 +377,16 @@
+ tdb_close(tdb);
+ }
+ tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+
diff --git a/patches/undefined-symbols.patch b/patches/undefined-symbols.patch
index 3945b775a4..0c9cc6362c 100644
--- a/patches/undefined-symbols.patch
+++ b/patches/undefined-symbols.patch
@@ -9,10 +9,10 @@ for it.
Note:
-Index: samba-3.0.25c/source/Makefile.in
+Index: samba-3.0.28a/source/Makefile.in
===================================================================
---- samba-3.0.25c.orig/source/Makefile.in 2007-08-26 13:09:01.919725881 +0200
-+++ samba-3.0.25c/source/Makefile.in 2007-08-26 13:09:04.419603900 +0200
+--- samba-3.0.28a.orig/source/Makefile.in
++++ samba-3.0.28a/source/Makefile.in
@@ -1161,7 +1161,7 @@
bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
diff --git a/patches/usershare.patch b/patches/usershare.patch
index 904637e985..d0ce87b3a3 100644
--- a/patches/usershare.patch
+++ b/patches/usershare.patch
@@ -8,10 +8,10 @@ Authors: Mathias Gug <mathiaz@ubuntu.com>,
Status wrt upstream: Debian-specific
-Index: samba-3.0.26a/docs/manpages/smb.conf.5
+Index: samba-3.0.28a/docs/manpages/smb.conf.5
===================================================================
---- samba-3.0.26a.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.26a/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
@@ -88,10 +88,10 @@ Index: samba-3.0.26a/docs/manpages/smb.conf.5
.RE
.PP
usershare prefix allow list (G)
-Index: samba-3.0.26a/docs/manpages/net.8
+Index: samba-3.0.28a/docs/manpages/net.8
===================================================================
---- samba-3.0.26a.orig/docs/manpages/net.8
-+++ samba-3.0.26a/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"
@@ -104,11 +104,11 @@ Index: samba-3.0.26a/docs/manpages/net.8
.PP
The usershare commands are:
.IP "" 3n
-Index: samba-3.0.26a/source/param/loadparm.c
+Index: samba-3.0.28a/source/param/loadparm.c
===================================================================
---- samba-3.0.26a.orig/source/param/loadparm.c
-+++ samba-3.0.26a/source/param/loadparm.c
-@@ -1676,7 +1676,7 @@
+--- samba-3.0.28a.orig/source/param/loadparm.c
++++ samba-3.0.28a/source/param/loadparm.c
+@@ -1689,7 +1689,7 @@
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
string_set(&Globals.szUsershareTemplateShare, "");
@@ -117,10 +117,10 @@ Index: samba-3.0.26a/source/param/loadparm.c
/* 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.26a/docs/htmldocs/manpages/smb.conf.5.html
+Index: samba-3.0.28a/docs/htmldocs/manpages/smb.conf.5.html
===================================================================
---- samba-3.0.26a.orig/docs/htmldocs/manpages/smb.conf.5.html
-+++ samba-3.0.26a/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
@@ -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.
@@ -166,10 +166,10 @@ Index: samba-3.0.26a/docs/htmldocs/manpages/smb.conf.5.html
</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.26a/docs/htmldocs/manpages/net.8.html
+Index: samba-3.0.28a/docs/htmldocs/manpages/net.8.html
===================================================================
---- samba-3.0.26a.orig/docs/htmldocs/manpages/net.8.html
-+++ samba-3.0.26a/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.