[Pkg-samba-maint] r1523 - in branches/samba/experimental/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Oct 6 07:05:57 UTC 2007
Author: bubulle
Date: 2007-10-06 07:05:57 +0000 (Sat, 06 Oct 2007)
New Revision: 1523
Modified:
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/fhs-assignpaths.patch
branches/samba/experimental/debian/patches/fhs-filespaths.patch
branches/samba/experimental/debian/patches/fhs-newpaths.patch
branches/samba/experimental/debian/patches/series
branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
branches/samba/experimental/debian/patches/smbstatus-locking.patch
branches/samba/experimental/debian/patches/undefined-symbols.patch
Log:
Populate the experimental branch with my current work on 3.2.0pre1
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/changelog 2007-10-06 07:05:57 UTC (rev 1523)
@@ -1,5 +1,7 @@
-samba (3.0.26a-2) UNRELEASED; urgency=low
+samba (3.2.0.pre1-1) unstable; urgency=low
+ * New upstream (pre-)release
+
[ Steve Langasek ]
* fhs.patch: net usershares should also be stored under /var/lib, not under
/var/run. No transition handling in maintainer scripts, since this
@@ -8,15 +10,8 @@
[ Debconf translations ]
* Hebrew added. Closes: #444054
- [ Christian Perrier ]
- * Split fhs.patch into 3 separate patches to make upstream integration
- easier:
- - fhs-newpaths.patch: introduce new paths
- - fhs-filespaths.patch: assign files to new paths
- - fhs-assignpaths.patch: assign paths to FHS-compatible locations
+ -- Christian Perrier <bubulle at debian.org> Sat, 29 Sep 2007 12:02:13 +0200
- -- Christian Perrier <bubulle at debian.org> Sun, 30 Sep 2007 14:32:27 +0200
-
samba (3.0.26a-1) unstable; urgency=low
* New upstream release.
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -18,19 +18,19 @@
export QUILT_PATCHES=debian/patches
quilt push autoconf.patch # to get everything applied up to this point
quilt push -f autoconf.patch # to override the errors when applying
- (cd source && autoconf -I lib/replace)
+ (cd source && autoconf -I m4 -I lib/replace)
# the -I lib/replace is needed because upstream seems to have done
# something screwy with where their m4 include files are distributed in the
# source tree; so this option may not be necessary in the future
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-3.0.25c/source/configure
+Index: samba-3.2.0pre1/source/configure
===================================================================
---- samba-3.0.25c.orig/source/configure 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/source/configure 2007-08-26 13:09:05.419555107 +0200
-@@ -671,6 +671,9 @@
- logfilebase
+--- samba-3.2.0pre1.orig/source/configure
++++ samba-3.2.0pre1/source/configure
+@@ -672,6 +672,9 @@
+ ctdbdir
privatedir
swatdir
+codepagedir
@@ -39,7 +39,7 @@
rootsbindir
pammodulesdir
SAMBA_CPPFLAGS
-@@ -2139,7 +2142,7 @@
+@@ -2145,7 +2148,7 @@
if test "${with_fhs+set}" = set; then
withval=$with_fhs; case "$withval" in
yes)
@@ -48,13 +48,13 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -2147,6 +2150,14 @@
+@@ -2153,6 +2156,14 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
-+ codepagedir="\${DATADIR}/samba"
++ codepagedir="\${prefix}/lib/samba"
+ statedir="\${VARDIR}/lib/samba"
-+ cachedir="\${VARDIR}/cache/samba"
++ cachedir="\${VARDIR}/lib/samba"
+
+cat >>confdefs.h <<\_ACEOF
+#define FHS_COMPATIBLE 1
@@ -63,7 +63,7 @@
;;
esac
fi
-@@ -2450,6 +2461,9 @@
+@@ -2472,6 +2483,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.
-@@ -11604,6 +11618,27 @@
+@@ -11694,6 +11708,27 @@
fi
;;
@@ -101,7 +101,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -34332,7 +34367,7 @@
+@@ -34654,7 +34689,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
-@@ -39240,11 +39275,14 @@
+@@ -39563,11 +39598,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"
-@@ -61780,7 +61818,7 @@
+@@ -62821,7 +62859,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -136,8 +136,8 @@
{ 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
-@@ -62802,11 +62840,11 @@
- SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
+@@ -63901,11 +63939,11 @@
+ NSSSONAMEVERSIONSUFFIX=""
case "$host_os" in
- *linux*)
@@ -150,8 +150,8 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-@@ -67324,6 +67362,9 @@
- logfilebase!$logfilebase$ac_delim
+@@ -68770,6 +68808,9 @@
+ ctdbdir!$ctdbdir$ac_delim
privatedir!$privatedir$ac_delim
swatdir!$swatdir$ac_delim
+codepagedir!$codepagedir$ac_delim
@@ -160,40 +160,40 @@
rootsbindir!$rootsbindir$ac_delim
pammodulesdir!$pammodulesdir$ac_delim
SAMBA_CPPFLAGS!$SAMBA_CPPFLAGS$ac_delim
-@@ -67361,9 +67402,6 @@
- PASSDB_LIBS!$PASSDB_LIBS$ac_delim
- IDMAP_LIBS!$IDMAP_LIBS$ac_delim
+@@ -68806,9 +68847,6 @@
KRB5_LIBS!$KRB5_LIBS$ac_delim
--UUID_LIBS!$UUID_LIBS$ac_delim
--LDAP_LIBS!$LDAP_LIBS$ac_delim
+ UUID_LIBS!$UUID_LIBS$ac_delim
+ LDAP_LIBS!$LDAP_LIBS$ac_delim
-PAM_MODULES!$PAM_MODULES$ac_delim
+-INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
+-UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67405,6 +67443,9 @@
+@@ -68850,6 +68888,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+UUID_LIBS!$UUID_LIBS$ac_delim
-+LDAP_LIBS!$LDAP_LIBS$ac_delim
+PAM_MODULES!$PAM_MODULES$ac_delim
- INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
- UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
++INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
++UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -67488,7 +67529,7 @@
+ EXTRA_BIN_PROGS!$EXTRA_BIN_PROGS$ac_delim
+ SMBMOUNT_PROGS!$SMBMOUNT_PROGS$ac_delim
+@@ -68932,7 +68973,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` = 80; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.0.25c/source/include/config.h.in
+Index: samba-3.2.0pre1/source/include/config.h.in
===================================================================
---- samba-3.0.25c.orig/source/include/config.h.in 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/source/include/config.h.in 2007-08-26 13:09:05.919530711 +0200
-@@ -57,6 +57,9 @@
+--- samba-3.2.0pre1.orig/source/include/config.h.in
++++ samba-3.2.0pre1/source/include/config.h.in
+@@ -60,6 +60,9 @@
/* Define to turn on dmalloc debugging */
#undef ENABLE_DMALLOC
Modified: branches/samba/experimental/debian/patches/fhs-assignpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-assignpaths.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/fhs-assignpaths.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -7,11 +7,11 @@
Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
change their default behaviour
-Index: samba-3.0.26a/source/configure.in
+Index: samba-3.2.0pre1/source/configure.in
===================================================================
---- samba-3.0.26a.orig/source/configure.in
-+++ samba-3.0.26a/source/configure.in
-@@ -40,7 +40,7 @@
+--- samba-3.2.0pre1.orig/source/configure.in
++++ samba-3.2.0pre1/source/configure.in
+@@ -46,7 +46,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
yes)
@@ -20,7 +20,7 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -48,9 +48,9 @@
+@@ -54,9 +54,9 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -45,11 +45,11 @@
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.26a/source/intl/lang_tdb.c
+Index: samba-3.2.0pre1/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/intl/lang_tdb.c
-+++ samba-3.0.26a/source/intl/lang_tdb.c
-@@ -131,7 +131,7 @@
+--- samba-3.2.0pre1.orig/source/intl/lang_tdb.c
++++ samba-3.2.0pre1/source/intl/lang_tdb.c
+@@ -127,7 +127,7 @@
if (!lang)
return True;
@@ -58,11 +58,11 @@
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.26a/source/lib/util.c
+Index: samba-3.2.0pre1/source/lib/util.c
===================================================================
---- samba-3.0.26a.orig/source/lib/util.c
-+++ samba-3.0.26a/source/lib/util.c
-@@ -2632,6 +2632,61 @@
+--- samba-3.2.0pre1.orig/source/lib/util.c
++++ samba-3.2.0pre1/source/lib/util.c
+@@ -2655,6 +2655,61 @@
}
/**
@@ -124,11 +124,11 @@
* @brief Returns the platform specific shared library extension.
*
* @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.26a/source/lib/util_unistr.c
+Index: samba-3.2.0pre1/source/lib/util_unistr.c
===================================================================
---- samba-3.0.26a.orig/source/lib/util_unistr.c
-+++ samba-3.0.26a/source/lib/util_unistr.c
-@@ -88,11 +88,11 @@
+--- samba-3.2.0pre1.orig/source/lib/util_unistr.c
++++ samba-3.2.0pre1/source/lib/util_unistr.c
+@@ -87,11 +87,11 @@
}
initialised = 1;
@@ -142,7 +142,7 @@
0x20000);
lowcase_table_use_unmap = ( lowcase_table != NULL );
-@@ -230,7 +230,7 @@
+@@ -229,7 +229,7 @@
return;
}
@@ -151,11 +151,11 @@
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-Index: samba-3.0.26a/source/libsmb/samlogon_cache.c
+Index: samba-3.2.0pre1/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.26a.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.0.26a/source/libsmb/samlogon_cache.c
-@@ -34,7 +34,7 @@
+--- samba-3.2.0pre1.orig/source/libsmb/samlogon_cache.c
++++ samba-3.2.0pre1/source/libsmb/samlogon_cache.c
+@@ -33,7 +33,7 @@
BOOL netsamlogon_cache_init(void)
{
if (!netsamlogon_tdb) {
@@ -164,7 +164,7 @@
TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
}
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,7 @@
winbindd_cache.tdb open. Open the tdb if a NULL is passed. */
if (!tdb) {
@@ -173,11 +173,11 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
-Index: samba-3.0.26a/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.2.0pre1/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.26a.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.0.26a/source/nmbd/nmbd_serverlistdb.c
-@@ -325,7 +325,7 @@
+--- samba-3.2.0pre1.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.2.0pre1/source/nmbd/nmbd_serverlistdb.c
+@@ -324,7 +324,7 @@
updatecount++;
@@ -186,11 +186,11 @@
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.26a/source/nmbd/nmbd_winsserver.c
+Index: samba-3.2.0pre1/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.26a.orig/source/nmbd/nmbd_winsserver.c
-+++ samba-3.0.26a/source/nmbd/nmbd_winsserver.c
-@@ -585,7 +585,7 @@
+--- samba-3.2.0pre1.orig/source/nmbd/nmbd_winsserver.c
++++ samba-3.2.0pre1/source/nmbd/nmbd_winsserver.c
+@@ -584,7 +584,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -199,7 +199,7 @@
DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
WINS_LIST, strerror(errno) ));
return True;
-@@ -2338,7 +2338,7 @@
+@@ -2337,7 +2337,7 @@
}
}
@@ -208,11 +208,11 @@
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-Index: samba-3.0.26a/source/passdb/login_cache.c
+Index: samba-3.2.0pre1/source/passdb/login_cache.c
===================================================================
---- samba-3.0.26a.orig/source/passdb/login_cache.c
-+++ samba-3.0.26a/source/passdb/login_cache.c
-@@ -36,7 +36,7 @@
+--- samba-3.2.0pre1.orig/source/passdb/login_cache.c
++++ samba-3.2.0pre1/source/passdb/login_cache.c
+@@ -35,7 +35,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -221,45 +221,11 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.0.26a/source/nsswitch/winbindd_cache.c
+Index: samba-3.2.0pre1/source/param/loadparm.c
===================================================================
---- samba-3.0.26a.orig/source/nsswitch/winbindd_cache.c
-+++ samba-3.0.26a/source/nsswitch/winbindd_cache.c
-@@ -2181,7 +2181,7 @@
- return True;
-
- /* when working offline we must not clear the cache on restart */
-- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- 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 @@
- tdb_close(wcache->tdb);
- wcache->tdb = NULL;
-
-- if (unlink(lock_path("winbindd_cache.tdb")) == -1) {
-+ if (unlink(cache_path("winbindd_cache.tdb")) == -1) {
- DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
-- lock_path("winbindd_cache.tdb"),
-+ cache_path("winbindd_cache.tdb"),
- strerror(errno) ));
- return False;
- }
-@@ -2488,7 +2488,7 @@
- return;
-
- /* when working offline we must not clear the cache on restart */
-- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- 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.26a/source/param/loadparm.c
-===================================================================
---- samba-3.0.26a.orig/source/param/loadparm.c
-+++ samba-3.0.26a/source/param/loadparm.c
-@@ -108,6 +108,9 @@
+--- samba-3.2.0pre1.orig/source/param/loadparm.c
++++ samba-3.2.0pre1/source/param/loadparm.c
+@@ -117,6 +117,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
char *szOs2DriverMap;
@@ -269,7 +235,7 @@
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -1200,8 +1203,13 @@
+@@ -1221,8 +1224,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},
@@ -283,7 +249,7 @@
{"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 @@
+@@ -1692,7 +1700,7 @@
Globals.bASUSupport = False;
/* User defined shares. */
@@ -292,11 +258,35 @@
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
string_set(&Globals.szUsershareTemplateShare, "");
-Index: samba-3.0.26a/source/passdb/secrets.c
+@@ -3332,12 +3340,12 @@
+ uint32 vers_id;
+
+ become_root();
+- reg_tdb = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0,
++ reg_tdb = tdb_wrap_open(NULL, state_path("registry.tdb"), 0,
+ REG_TDB_FLAGS, O_RDWR, 0600);
+ unbecome_root();
+ if (!reg_tdb) {
+ DEBUG(1, ("lp_regdb_open: failed to open %s: %s\n",
+- lock_path("registry.tdb"), strerror(errno)));
++ state_path("registry.tdb"), strerror(errno)));
+ goto done;
+ }
+ else {
+@@ -3348,7 +3356,7 @@
+ if (vers_id != REGVER_V1) {
+ DEBUG(10, ("lp_regdb_open: INFO: registry tdb %s has wrong "
+ "INFO/version (got %d, expected %d)\n",
+- lock_path("registry.tdb"), vers_id, REGVER_V1));
++ state_path("registry.tdb"), vers_id, REGVER_V1));
+ /* this is apparently not implemented in the tdb */
+ }
+
+Index: samba-3.2.0pre1/source/passdb/secrets.c
===================================================================
---- samba-3.0.26a.orig/source/passdb/secrets.c
-+++ samba-3.0.26a/source/passdb/secrets.c
-@@ -58,8 +58,7 @@
+--- samba-3.2.0pre1.orig/source/passdb/secrets.c
++++ samba-3.2.0pre1/source/passdb/secrets.c
+@@ -57,8 +57,7 @@
if (tdb)
return True;
@@ -306,11 +296,11 @@
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.26a/source/printing/nt_printing.c
+Index: samba-3.2.0pre1/source/printing/nt_printing.c
===================================================================
---- samba-3.0.26a.orig/source/printing/nt_printing.c
-+++ samba-3.0.26a/source/printing/nt_printing.c
-@@ -551,28 +551,28 @@
+--- samba-3.2.0pre1.orig/source/printing/nt_printing.c
++++ samba-3.2.0pre1/source/printing/nt_printing.c
+@@ -552,28 +552,28 @@
if (tdb_drivers)
tdb_close(tdb_drivers);
@@ -345,7 +335,7 @@
return False;
}
-@@ -2359,7 +2359,7 @@
+@@ -2355,7 +2355,7 @@
close_all_print_db();
if (geteuid() == 0) {
@@ -354,11 +344,11 @@
pstrcat(printdb_path, sharename);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.26a/source/printing/printing.c
+Index: samba-3.2.0pre1/source/printing/printing.c
===================================================================
---- samba-3.0.26a.orig/source/printing/printing.c
-+++ samba-3.0.26a/source/printing/printing.c
-@@ -185,8 +185,8 @@
+--- samba-3.2.0pre1.orig/source/printing/printing.c
++++ samba-3.2.0pre1/source/printing/printing.c
+@@ -184,8 +184,8 @@
int services = lp_numservices();
int snum;
@@ -369,11 +359,11 @@
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-Index: samba-3.0.26a/source/printing/printing_db.c
+Index: samba-3.2.0pre1/source/printing/printing_db.c
===================================================================
---- samba-3.0.26a.orig/source/printing/printing_db.c
-+++ samba-3.0.26a/source/printing/printing_db.c
-@@ -91,7 +91,7 @@
+--- samba-3.2.0pre1.orig/source/printing/printing_db.c
++++ samba-3.2.0pre1/source/printing/printing_db.c
+@@ -90,7 +90,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -382,11 +372,11 @@
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.26a/source/smbd/lanman.c
+Index: samba-3.2.0pre1/source/smbd/lanman.c
===================================================================
---- samba-3.0.26a.orig/source/smbd/lanman.c
-+++ samba-3.0.26a/source/smbd/lanman.c
-@@ -1088,9 +1088,9 @@
+--- samba-3.2.0pre1.orig/source/smbd/lanman.c
++++ samba-3.2.0pre1/source/smbd/lanman.c
+@@ -1102,9 +1102,9 @@
BOOL local_list_only;
int i;
@@ -398,19 +388,19 @@
return 0;
}
-Index: samba-3.0.26a/source/registry/reg_db.c
+Index: samba-3.2.0pre1/source/registry/reg_db.c
===================================================================
---- samba-3.0.26a.orig/source/registry/reg_db.c
-+++ samba-3.0.26a/source/registry/reg_db.c
-@@ -234,12 +234,12 @@
+--- samba-3.2.0pre1.orig/source/registry/reg_db.c
++++ samba-3.2.0pre1/source/registry/reg_db.c
+@@ -230,12 +230,12 @@
if ( tdb_reg )
return True;
-- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
-+ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+- if ( !(tdb_reg = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600)) )
++ if ( !(tdb_reg = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600)) )
{
-- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+- tdb_reg = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600);
++ tdb_reg = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600);
if ( !tdb_reg ) {
DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
- lock_path("registry.tdb"), strerror(errno) ));
@@ -418,12 +408,12 @@
return False;
}
-@@ -281,11 +281,11 @@
+@@ -278,11 +278,11 @@
become_root();
-- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+- tdb_reg = tdb_wrap_open(NULL, lock_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600);
++ tdb_reg = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600);
if ( !tdb_reg ) {
result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",
@@ -432,11 +422,11 @@
}
unbecome_root();
-Index: samba-3.0.26a/source/lib/account_pol.c
+Index: samba-3.2.0pre1/source/lib/account_pol.c
===================================================================
---- samba-3.0.26a.orig/source/lib/account_pol.c
-+++ samba-3.0.26a/source/lib/account_pol.c
-@@ -213,9 +213,9 @@
+--- samba-3.2.0pre1.orig/source/lib/account_pol.c
++++ samba-3.2.0pre1/source/lib/account_pol.c
+@@ -212,9 +212,9 @@
return True;
}
@@ -448,20 +438,20 @@
if (!tdb) {
DEBUG(0,("Failed to open account policy database\n"));
return False;
-Index: samba-3.0.26a/source/registry/reg_perfcount.c
+Index: samba-3.2.0pre1/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.26a.orig/source/registry/reg_perfcount.c
-+++ samba-3.0.26a/source/registry/reg_perfcount.c
-@@ -46,7 +46,7 @@
+--- samba-3.2.0pre1.orig/source/registry/reg_perfcount.c
++++ samba-3.2.0pre1/source/registry/reg_perfcount.c
+@@ -45,7 +45,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
- pstrcpy( fname, lock_path( path ) );
+ pstrcpy( fname, state_path( path ) );
- return fname;
+ return talloc_strdup(talloc_tos(), fname);
}
-@@ -56,7 +56,7 @@
+@@ -55,7 +55,7 @@
void perfcount_init_keys( void )
{
@@ -470,11 +460,11 @@
/* no registry keys; just create the perfmon directory */
-Index: samba-3.0.26a/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.2.0pre1/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.26a.orig/source/rpc_server/srv_eventlog_lib.c
-+++ samba-3.0.26a/source/rpc_server/srv_eventlog_lib.c
-@@ -67,7 +67,7 @@
+--- samba-3.2.0pre1.orig/source/rpc_server/srv_eventlog_lib.c
++++ samba-3.2.0pre1/source/rpc_server/srv_eventlog_lib.c
+@@ -66,7 +66,7 @@
{
fstring path;
char *tdb_fullpath;
@@ -483,7 +473,7 @@
pstr_sprintf( path, "%s/%s.tdb", eventlogdir, name );
strlower_m( path );
-@@ -349,7 +349,7 @@
+@@ -348,7 +348,7 @@
/* make sure that the eventlog dir exists */
@@ -492,11 +482,11 @@
if ( !directory_exist( eventlogdir, NULL ) )
mkdir( eventlogdir, 0755 );
-Index: samba-3.0.26a/source/passdb/pdb_tdb.c
+Index: samba-3.2.0pre1/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/passdb/pdb_tdb.c
-+++ samba-3.0.26a/source/passdb/pdb_tdb.c
-@@ -1559,7 +1559,7 @@
+--- samba-3.2.0pre1.orig/source/passdb/pdb_tdb.c
++++ samba-3.2.0pre1/source/passdb/pdb_tdb.c
+@@ -1542,7 +1542,7 @@
uint32 rid;
BOOL ret = False;
@@ -505,7 +495,7 @@
TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
if (tdb == NULL) {
-@@ -1623,7 +1623,7 @@
+@@ -1606,7 +1606,7 @@
/* save the path for later */
if ( !location ) {
@@ -514,11 +504,11 @@
pfile = tdbfile;
}
pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.26a/source/groupdb/mapping_tdb.c
+Index: samba-3.2.0pre1/source/groupdb/mapping_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/groupdb/mapping_tdb.c
-+++ samba-3.0.26a/source/groupdb/mapping_tdb.c
-@@ -39,7 +39,7 @@
+--- samba-3.2.0pre1.orig/source/groupdb/mapping_tdb.c
++++ samba-3.2.0pre1/source/groupdb/mapping_tdb.c
+@@ -42,7 +42,7 @@
if (tdb)
return True;
@@ -527,24 +517,11 @@
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-Index: samba-3.0.26a/source/nsswitch/idmap_tdb.c
+Index: samba-3.2.0pre1/source/utils/smbcontrol.c
===================================================================
---- samba-3.0.26a.orig/source/nsswitch/idmap_tdb.c
-+++ samba-3.0.26a/source/nsswitch/idmap_tdb.c
-@@ -247,7 +247,7 @@
- }
-
- /* use the old database if present */
-- tdbfile = talloc_strdup(ctx, lock_path("winbindd_idmap.tdb"));
-+ tdbfile = talloc_strdup(ctx, state_path("winbindd_idmap.tdb"));
- if (!tdbfile) {
- DEBUG(0, ("Out of memory!\n"));
- ret = NT_STATUS_NO_MEMORY;
-Index: samba-3.0.26a/source/utils/smbcontrol.c
-===================================================================
---- samba-3.0.26a.orig/source/utils/smbcontrol.c
-+++ samba-3.0.26a/source/utils/smbcontrol.c
-@@ -832,10 +832,10 @@
+--- samba-3.2.0pre1.orig/source/utils/smbcontrol.c
++++ samba-3.2.0pre1/source/utils/smbcontrol.c
+@@ -875,10 +875,10 @@
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
@@ -557,7 +534,7 @@
return False;
}
-@@ -868,13 +868,13 @@
+@@ -912,13 +912,13 @@
starting winbindd that we're offline. We may actually create
it here... */
@@ -573,11 +550,11 @@
return False;
}
-Index: samba-3.0.26a/source/lib/sharesec.c
+Index: samba-3.2.0pre1/source/lib/sharesec.c
===================================================================
---- samba-3.0.26a.orig/source/lib/sharesec.c
-+++ samba-3.0.26a/source/lib/sharesec.c
-@@ -47,10 +47,10 @@
+--- samba-3.2.0pre1.orig/source/lib/sharesec.c
++++ samba-3.2.0pre1/source/lib/sharesec.c
+@@ -46,10 +46,10 @@
return True;
}
@@ -590,11 +567,11 @@
return False;
}
-Index: samba-3.0.26a/source/libgpo/gpo_fetch.c
+Index: samba-3.2.0pre1/source/libgpo/gpo_fetch.c
===================================================================
---- samba-3.0.26a.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.0.26a/source/libgpo/gpo_fetch.c
-@@ -60,7 +60,7 @@
+--- samba-3.2.0pre1.orig/source/libgpo/gpo_fetch.c
++++ samba-3.2.0pre1/source/libgpo/gpo_fetch.c
+@@ -63,7 +63,7 @@
return NT_STATUS_NO_MEMORY;
}
@@ -603,20 +580,20 @@
pstrcat(path, "/");
pstrcat(path, file_sys_path);
pstring_sub(path, "\\", "/");
-@@ -80,7 +80,7 @@
- TALLOC_CTX *mem_ctx,
- const char *unix_path)
+@@ -82,7 +82,7 @@
+ static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
+ const char *unix_path)
{
- const char *top_dir = lock_path(GPO_CACHE_DIR);
+ const char *top_dir = cache_path(GPO_CACHE_DIR);
char *current_dir;
fstring tok;
-Index: samba-3.0.26a/source/nsswitch/idmap_cache.c
+Index: samba-3.2.0pre1/source/winbindd/idmap_cache.c
===================================================================
---- samba-3.0.26a.orig/source/nsswitch/idmap_cache.c
-+++ samba-3.0.26a/source/nsswitch/idmap_cache.c
-@@ -55,7 +55,7 @@
+--- samba-3.2.0pre1.orig/source/winbindd/idmap_cache.c
++++ samba-3.2.0pre1/source/winbindd/idmap_cache.c
+@@ -54,7 +54,7 @@
return NULL;
}
@@ -625,3 +602,50 @@
DEBUG(10, ("Opening cache file at %s\n", cache_fname));
+Index: samba-3.2.0pre1/source/groupdb/mapping_ldb.c
+===================================================================
+--- samba-3.2.0pre1.orig/source/groupdb/mapping_ldb.c
++++ samba-3.2.0pre1/source/groupdb/mapping_ldb.c
+@@ -55,7 +55,7 @@
+ /* this is needed as Samba3 doesn't have this globally yet */
+ ldb_global_init();
+
+- db_path = lock_path("group_mapping.ldb");
++ db_path = state_path("group_mapping.ldb");
+
+ ldb = ldb_init(NULL);
+ if (ldb == NULL) goto failed;
+@@ -89,9 +89,9 @@
+ }
+
+ /* possibly upgrade */
+- tdb_path = lock_path("group_mapping.tdb");
++ tdb_path = state_path("group_mapping.tdb");
+ if (file_exist(tdb_path, NULL) && !mapping_upgrade(tdb_path)) {
+- unlink(lock_path("group_mapping.ldb"));
++ unlink(state_path("group_mapping.ldb"));
+ goto failed;
+ }
+
+@@ -638,7 +638,7 @@
+ }
+
+ pstrcpy(old_path, tdb_path);
+- pstrcpy(new_path, lock_path("group_mapping.tdb.upgraded"));
++ pstrcpy(new_path, state_path("group_mapping.tdb.upgraded"));
+
+ if (rename(old_path, new_path) != 0) {
+ DEBUG(0,("Failed to rename old group mapping database\n"));
+Index: samba-3.2.0pre1/source/winbindd/idmap_tdb.c
+===================================================================
+--- samba-3.2.0pre1.orig/source/winbindd/idmap_tdb.c
++++ samba-3.2.0pre1/source/winbindd/idmap_tdb.c
+@@ -221,7 +221,7 @@
+ }
+
+ /* use the old database if present */
+- tdbfile = talloc_strdup(ctx, lock_path("winbindd_idmap.tdb"));
++ tdbfile = talloc_strdup(ctx, state_path("winbindd_idmap.tdb"));
+ if (!tdbfile) {
+ DEBUG(0, ("Out of memory!\n"));
+ ret = NT_STATUS_NO_MEMORY;
Modified: branches/samba/experimental/debian/patches/fhs-newpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-newpaths.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/fhs-newpaths.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -10,11 +10,11 @@
Note: See fhs-filespaths for rationale about the meaning of the new
path variables
-Index: samba-3.0.25c/source/Makefile.in
+Index: samba-3.2.0pre1/source/Makefile.in
===================================================================
---- samba-3.0.25c.orig/source/Makefile.in 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/Makefile.in 2007-08-26 13:08:59.419847863 +0200
-@@ -106,6 +106,13 @@
+--- samba-3.2.0pre1.orig/source/Makefile.in
++++ samba-3.2.0pre1/source/Makefile.in
+@@ -121,6 +121,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -28,18 +28,21 @@
# the directory where pid files go
PIDDIR = @piddir@
-@@ -139,7 +146,7 @@
- PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
- PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
- -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
--PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
-+PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -DCACHEDIR=\"$(CACHEDIR)\" -DSTATEDIR=\"$(STATEDIR)\"
- PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
+@@ -148,7 +155,10 @@
+ -DLOGFILEBASE=\"$(LOGFILEBASE)\" \
+ -DSHLIBEXT=\"@SHLIBEXT@\" \
+ -DCTDBDIR=\"$(CTDBDIR)\" \
+- -DCONFIGDIR=\"$(CONFIGDIR)\"
++ -DCONFIGDIR=\"$(CONFIGDIR)\" \
++ -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" \
++ -DCACHEDIR=\"$(CACHEDIR)\" \
++ -DSTATEDIR=\"$(STATEDIR)\"
# Note that all executable programs now provide for an optional executable suffix.
-@@ -1613,10 +1620,10 @@
- @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
+@@ -1785,10 +1795,10 @@
+ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS)
+
installdat: installdirs
- @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
+ @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
@@ -50,11 +53,11 @@
installswat: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.25c/source/configure.in
+Index: samba-3.2.0pre1/source/configure.in
===================================================================
---- samba-3.0.25c.orig/source/configure.in 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/configure.in 2007-08-26 13:08:59.419847863 +0200
-@@ -48,6 +48,10 @@
+--- samba-3.2.0pre1.orig/source/configure.in
++++ samba-3.2.0pre1/source/configure.in
+@@ -54,6 +54,10 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
@@ -65,7 +68,7 @@
;;
esac])
-@@ -252,6 +256,9 @@
+@@ -273,6 +277,9 @@
AC_SUBST(swatdir)
AC_SUBST(bindir)
AC_SUBST(sbindir)
@@ -75,11 +78,11 @@
AC_SUBST(rootsbindir)
AC_SUBST(pammodulesdir)
-Index: samba-3.0.25c/source/dynconfig.c
+Index: samba-3.2.0pre1/source/dynconfig.c
===================================================================
---- samba-3.0.25c.orig/source/dynconfig.c 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/dynconfig.c 2007-08-26 13:08:59.419847863 +0200
-@@ -53,6 +53,13 @@
+--- samba-3.2.0pre1.orig/source/dynconfig.c
++++ samba-3.2.0pre1/source/dynconfig.c
+@@ -52,6 +52,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
/**
@@ -93,7 +96,7 @@
* @brief Samba library directory.
*
* @sa lib_path() to get the path to a file inside the LIBDIR.
-@@ -70,3 +77,27 @@
+@@ -69,3 +76,27 @@
pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
@@ -121,11 +124,11 @@
+ return lp_lockdir();
+#endif
+}
-Index: samba-3.0.25c/source/include/dynconfig.h
+Index: samba-3.2.0pre1/source/include/dynconfig.h
===================================================================
---- samba-3.0.25c.orig/source/include/dynconfig.h 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/include/dynconfig.h 2007-08-26 13:08:59.419847863 +0200
-@@ -31,8 +31,12 @@
+--- samba-3.2.0pre1.orig/source/include/dynconfig.h
++++ samba-3.2.0pre1/source/include/dynconfig.h
+@@ -30,8 +30,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
extern pstring dyn_LIBDIR;
Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/series 2007-10-06 07:05:57 UTC (rev 1523)
@@ -4,7 +4,6 @@
fhs-filespaths.patch
fhs-assignpaths.patch
installswat.sh.patch
-make-distclean.patch
non-linux-ports.patch
pam-examples.patch
README_nosmbldap-tools.patch
@@ -12,7 +11,7 @@
smbclient-pager.patch
smbmount-mtab-flags.patch
smbmount-nomtab.patch
-smbstatus-locking.patch
+#smbstatus-locking.patch
undefined-symbols.patch
VERSION.patch
adapt_machine_creation_script.patch
Modified: branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbpasswd-syslog.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/smbpasswd-syslog.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -4,19 +4,19 @@
Upstream status: submitted as bugzilla bug #4831
-Index: samba-3.0.25c/source/pam_smbpass/support.c
+Index: samba-3.2.0pre1/source/pam_smbpass/support.c
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/support.c 2007-08-26 12:07:14.098417404 +0200
-+++ samba-3.0.25c/source/pam_smbpass/support.c 2007-08-26 13:09:09.419359938 +0200
-@@ -15,6 +15,7 @@
- * Mass Ave, Cambridge, MA 02139, USA.
+--- samba-3.2.0pre1.orig/source/pam_smbpass/support.c
++++ samba-3.2.0pre1/source/pam_smbpass/support.c
+@@ -14,6 +14,7 @@
+ * this program; if not, see <http://www.gnu.org/licenses/>.
*/
+ #include "config.h"
#include "includes.h"
#include "general.h"
-@@ -66,19 +67,44 @@
+@@ -65,19 +66,44 @@
char *servicesf = dyn_CONFIGFILE;
@@ -71,7 +71,7 @@
/* this is a front-end for module-application conversations */
int converse( pam_handle_t * pamh, int ctrl, int nargs
-@@ -95,12 +121,14 @@
+@@ -94,12 +120,14 @@
,response, conv->appdata_ptr);
if (retval != PAM_SUCCESS && on(SMB_DEBUG, ctrl)) {
@@ -90,7 +90,7 @@
}
return retval; /* propagate error status */
-@@ -126,7 +154,7 @@
+@@ -125,7 +153,7 @@
/* set the control flags for the SMB module. */
@@ -99,7 +99,7 @@
{
int i = 0;
const char *service_file = dyn_CONFIGFILE;
-@@ -168,7 +196,7 @@
+@@ -167,7 +195,7 @@
/* Read some options from the Samba config. Can be overridden by
the PAM config. */
if(lp_load(service_file,True,False,False,True) == False) {
@@ -108,7 +108,7 @@
}
secrets_init();
-@@ -191,7 +219,7 @@
+@@ -190,7 +218,7 @@
}
if (j >= SMB_CTRLS_) {
@@ -117,7 +117,7 @@
} else {
ctrl &= smb_args[j].mask; /* for turning things off */
ctrl |= smb_args[j].flag; /* for turning things on */
-@@ -230,7 +258,7 @@
+@@ -229,7 +257,7 @@
* evidence of old token around for later stack analysis.
*
*/
@@ -126,7 +126,7 @@
{
register char *newstr = NULL;
-@@ -240,7 +268,7 @@
+@@ -239,7 +267,7 @@
for (i = 0; x[i]; ++i); /* length of string */
if ((newstr = SMB_MALLOC_ARRAY(char, ++i)) == NULL) {
i = 0;
@@ -135,7 +135,7 @@
} else {
while (i-- > 0) {
newstr[i] = x[i];
-@@ -282,7 +310,7 @@
+@@ -281,7 +309,7 @@
/* log the number of authentication failures */
if (failure->count != 0) {
pam_get_item( pamh, PAM_SERVICE, (const void **) &service );
@@ -144,7 +144,7 @@
, "%d authentication %s "
"from %s for service %s as %s(%d)"
, failure->count
-@@ -291,7 +319,7 @@
+@@ -290,7 +318,7 @@
, service == NULL ? "**unknown**" : service
, failure->user, failure->id );
if (failure->count > SMB_MAX_RETRIES) {
@@ -153,7 +153,7 @@
, "service(%s) ignoring max retries; %d > %d"
, service == NULL ? "**unknown**" : service
, failure->count
-@@ -327,8 +355,7 @@
+@@ -326,8 +354,7 @@
if (!pdb_get_lanman_passwd(sampass))
{
@@ -163,7 +163,7 @@
if (off( SMB__NONULL, ctrl )
&& (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ))
-@@ -338,15 +365,16 @@
+@@ -337,15 +364,16 @@
const char *service;
pam_get_item( pamh, PAM_SERVICE, (const void **)&service );
@@ -183,7 +183,7 @@
}
strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
strncpy( data_name + sizeof(FAIL_PREFIX) - 1, name, strlen( name ) + 1 );
-@@ -392,31 +420,31 @@
+@@ -391,31 +419,31 @@
retval = PAM_MAXTRIES;
}
} else {
@@ -222,7 +222,7 @@
"failed auth request by %s for service %s as %s(%d)",
uidtoname(getuid()),
service ? service : "**unknown**", name);
-@@ -490,8 +518,8 @@
+@@ -489,8 +517,8 @@
retval = pam_get_item( pamh, authtok_flag, (const void **) &item );
if (retval != PAM_SUCCESS) {
/* very strange. */
@@ -233,7 +233,7 @@
return retval;
} else if (item != NULL) { /* we have a password! */
*pass = item;
-@@ -543,7 +571,7 @@
+@@ -542,7 +570,7 @@
if (retval == PAM_SUCCESS) { /* a good conversation */
@@ -242,7 +242,7 @@
if (token != NULL) {
if (expect == 2) {
/* verify that password entered correctly */
-@@ -555,7 +583,8 @@
+@@ -554,7 +582,8 @@
}
}
} else {
@@ -252,7 +252,7 @@
}
}
-@@ -568,7 +597,7 @@
+@@ -567,7 +596,7 @@
if (retval != PAM_SUCCESS) {
if (on( SMB_DEBUG, ctrl ))
@@ -261,7 +261,7 @@
return retval;
}
/* 'token' is the entered password */
-@@ -583,7 +612,7 @@
+@@ -582,7 +611,7 @@
|| (retval = pam_get_item( pamh, authtok_flag
,(const void **)&item )) != PAM_SUCCESS)
{
@@ -270,7 +270,7 @@
return retval;
}
} else {
-@@ -597,8 +626,8 @@
+@@ -596,8 +625,8 @@
|| (retval = pam_get_data( pamh, data_name, (const void **)&item ))
!= PAM_SUCCESS)
{
@@ -281,7 +281,7 @@
_pam_delete( token );
item = NULL;
return retval;
-@@ -622,8 +651,8 @@
+@@ -621,8 +650,8 @@
if (pass_new == NULL || (pass_old && !strcmp( pass_old, pass_new )))
{
if (on(SMB_DEBUG, ctrl)) {
@@ -292,11 +292,11 @@
}
make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
"No password supplied" : "Password unchanged" );
-Index: samba-3.0.25c/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.2.0pre1/source/pam_smbpass/pam_smb_auth.c
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/pam_smb_auth.c 2007-08-26 12:07:14.098417404 +0200
-+++ samba-3.0.25c/source/pam_smbpass/pam_smb_auth.c 2007-08-26 13:09:09.419359938 +0200
-@@ -75,10 +75,9 @@
+--- samba-3.2.0pre1.orig/source/pam_smbpass/pam_smb_auth.c
++++ samba-3.2.0pre1/source/pam_smbpass/pam_smb_auth.c
+@@ -82,10 +82,9 @@
/* Samba initialization. */
load_case_tables();
@@ -308,23 +308,23 @@
/* Get a few bytes so we can pass our return value to
pam_sm_setcred(). */
-@@ -93,23 +92,23 @@
+@@ -100,23 +99,23 @@
retval = pam_get_user( pamh, &name, "Username: " );
if ( retval != PAM_SUCCESS ) {
if (on( SMB_DEBUG, ctrl )) {
- _log_err(LOG_DEBUG, "auth: could not identify user");
-+ _log_err(pamh, LOG_DEBUG, "auth: could not identify user");
++ _log_err(pamh, LOG_DEBUG, "auth: could not identify user");
}
AUTH_RETURN;
}
if (on( SMB_DEBUG, ctrl )) {
- _log_err( LOG_DEBUG, "username [%s] obtained", name );
-+ _log_err(pamh, LOG_DEBUG, "username [%s] obtained", name);
++ _log_err(pamh, LOG_DEBUG, "username [%s] obtained", name );
}
- if (!initialize_password_db(True)) {
+ if (!initialize_password_db(True, NULL)) {
- _log_err( LOG_ALERT, "Cannot access samba password database" );
-+ _log_err(pamh, LOG_ALERT, "Cannot access samba password database");
++ _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
retval = PAM_AUTHINFO_UNAVAIL;
AUTH_RETURN;
}
@@ -332,11 +332,11 @@
sampass = samu_new( NULL );
if (!sampass) {
- _log_err( LOG_ALERT, "Cannot talloc a samu struct" );
-+ _log_err(pamh, LOG_ALERT, "Cannot talloc a samu struct");
++ _log_err(pamh, LOG_ALERT, "Cannot talloc a samu struct" );
retval = nt_status_to_pam(NT_STATUS_NO_MEMORY);
AUTH_RETURN;
}
-@@ -123,7 +122,7 @@
+@@ -130,7 +129,7 @@
}
if (!found) {
@@ -345,7 +345,7 @@
retval = PAM_USER_UNKNOWN;
TALLOC_FREE(sampass);
sampass = NULL;
-@@ -142,7 +141,7 @@
+@@ -149,7 +148,7 @@
retval = _smb_read_password(pamh, ctrl, NULL, "Password: ", NULL, _SMB_AUTHTOK, &p);
if (retval != PAM_SUCCESS ) {
@@ -354,7 +354,7 @@
TALLOC_FREE(sampass);
AUTH_RETURN;
}
-@@ -194,8 +193,8 @@
+@@ -201,8 +200,8 @@
retval = pam_get_item( pamh, PAM_AUTHTOK, (const void **) &pass );
if (retval != PAM_SUCCESS) {
@@ -365,11 +365,11 @@
return PAM_AUTHTOK_RECOVER_ERR;
} else if (pass == NULL) {
return PAM_AUTHTOK_RECOVER_ERR;
-Index: samba-3.0.25c/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.2.0pre1/source/pam_smbpass/pam_smb_acct.c
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/pam_smb_acct.c 2007-08-26 12:07:14.098417404 +0200
-+++ samba-3.0.25c/source/pam_smbpass/pam_smb_acct.c 2007-08-26 13:09:09.419359938 +0200
-@@ -52,29 +52,28 @@
+--- samba-3.2.0pre1.orig/source/pam_smbpass/pam_smb_acct.c
++++ samba-3.2.0pre1/source/pam_smbpass/pam_smb_acct.c
+@@ -59,29 +59,28 @@
/* Samba initialization. */
load_case_tables();
@@ -377,7 +377,7 @@
in_client = True;
- ctrl = set_ctrl( flags, argc, argv );
-+ ctrl = set_ctrl(pamh, flags, argc, argv);
++ ctrl = set_ctrl(pamh, flags, argc, argv );
/* get the username */
@@ -385,25 +385,25 @@
if (retval != PAM_SUCCESS) {
if (on( SMB_DEBUG, ctrl )) {
- _log_err( LOG_DEBUG, "acct: could not identify user" );
-+ _log_err(pamh, LOG_DEBUG, "acct: could not identify user");
++ _log_err(pamh, LOG_DEBUG, "acct: could not identify user" );
}
return retval;
}
if (on( SMB_DEBUG, ctrl )) {
- _log_err( LOG_DEBUG, "acct: username [%s] obtained", name );
-+ _log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name);
++ _log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name );
}
/* Getting into places that might use LDAP -- protect the app
from a SIGPIPE it's not expecting */
oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
- if (!initialize_password_db(True)) {
+ if (!initialize_password_db(True, NULL)) {
- _log_err( LOG_ALERT, "Cannot access samba password database" );
-+ _log_err(pamh, LOG_ALERT, "Cannot access samba password database");
++ _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
return PAM_AUTHINFO_UNAVAIL;
}
-@@ -88,7 +87,7 @@
+@@ -95,7 +94,7 @@
}
if (!pdb_getsampwnam(sampass, name )) {
@@ -412,7 +412,7 @@
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
return PAM_USER_UNKNOWN;
}
-@@ -101,8 +100,8 @@
+@@ -108,8 +107,8 @@
if (pdb_get_acct_ctrl(sampass) & ACB_DISABLED) {
if (on( SMB_DEBUG, ctrl )) {
@@ -423,11 +423,11 @@
}
make_remark( pamh, ctrl, PAM_ERROR_MSG
, "Your account has been disabled; "
-Index: samba-3.0.25c/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.2.0pre1/source/pam_smbpass/pam_smb_passwd.c
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/pam_smb_passwd.c 2007-08-26 12:07:14.098417404 +0200
-+++ samba-3.0.25c/source/pam_smbpass/pam_smb_passwd.c 2007-08-26 13:09:09.419359938 +0200
-@@ -104,10 +104,9 @@
+--- samba-3.2.0pre1.orig/source/pam_smbpass/pam_smb_passwd.c
++++ samba-3.2.0pre1/source/pam_smbpass/pam_smb_passwd.c
+@@ -111,10 +111,9 @@
/* Samba initialization. */
load_case_tables();
@@ -439,7 +439,7 @@
/*
* First get the name of a user. No need to do anything if we can't
-@@ -117,12 +116,12 @@
+@@ -124,12 +123,12 @@
retval = pam_get_user( pamh, &user, "Username: " );
if (retval != PAM_SUCCESS) {
if (on( SMB_DEBUG, ctrl )) {
@@ -454,16 +454,16 @@
}
/* Getting into places that might use LDAP -- protect the app
-@@ -130,7 +129,7 @@
+@@ -137,7 +136,7 @@
oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
- if (!initialize_password_db(False)) {
+ if (!initialize_password_db(False, NULL)) {
- _log_err( LOG_ALERT, "Cannot access samba password database" );
-+ _log_err(pamh, LOG_ALERT, "Cannot access samba password database");
++ _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
return PAM_AUTHINFO_UNAVAIL;
}
-@@ -142,12 +141,12 @@
+@@ -149,12 +148,12 @@
}
if (!pdb_getsampwnam(sampass,user)) {
@@ -478,7 +478,7 @@
}
if (flags & PAM_PRELIM_CHECK) {
-@@ -173,7 +172,7 @@
+@@ -180,7 +179,7 @@
#define greeting "Changing password for "
Announce = SMB_MALLOC_ARRAY(char, sizeof(greeting)+strlen(user));
if (Announce == NULL) {
@@ -487,7 +487,7 @@
TALLOC_FREE(sampass);
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
return PAM_BUF_ERR;
-@@ -188,8 +187,8 @@
+@@ -195,8 +194,8 @@
SAFE_FREE( Announce );
if (retval != PAM_SUCCESS) {
@@ -498,7 +498,7 @@
TALLOC_FREE(sampass);
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
return retval;
-@@ -234,7 +233,7 @@
+@@ -241,7 +240,7 @@
}
if (retval != PAM_SUCCESS) {
@@ -507,7 +507,7 @@
TALLOC_FREE(sampass);
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
return retval;
-@@ -259,8 +258,8 @@
+@@ -266,8 +265,8 @@
if (retval != PAM_SUCCESS) {
if (on( SMB_DEBUG, ctrl )) {
@@ -518,7 +518,7 @@
}
pass_old = NULL; /* tidy up */
TALLOC_FREE(sampass);
-@@ -281,7 +280,7 @@
+@@ -288,7 +287,7 @@
retval = _pam_smb_approve_pass(pamh, ctrl, pass_old, pass_new);
if (retval != PAM_SUCCESS) {
@@ -527,7 +527,7 @@
pass_new = pass_old = NULL; /* tidy up */
TALLOC_FREE(sampass);
CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-@@ -301,16 +300,17 @@
+@@ -308,16 +307,17 @@
/* password updated */
if (!sid_to_uid(pdb_get_user_sid(sampass), &uid)) {
@@ -549,7 +549,7 @@
}
pass_old = pass_new = NULL;
-@@ -321,7 +321,7 @@
+@@ -328,7 +328,7 @@
} else { /* something has broken with the library */
@@ -558,10 +558,10 @@
retval = PAM_ABORT;
}
-Index: samba-3.0.25c/source/pam_smbpass/support.h
+Index: samba-3.2.0pre1/source/pam_smbpass/support.h
===================================================================
---- samba-3.0.25c.orig/source/pam_smbpass/support.h 2007-08-26 12:07:14.098417404 +0200
-+++ samba-3.0.25c/source/pam_smbpass/support.h 2007-08-26 13:09:09.419359938 +0200
+--- samba-3.2.0pre1.orig/source/pam_smbpass/support.h
++++ samba-3.2.0pre1/source/pam_smbpass/support.h
@@ -1,8 +1,8 @@
/* syslogging function for errors and other information */
-extern void _log_err(int, const char *, ...);
Modified: branches/samba/experimental/debian/patches/smbstatus-locking.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbstatus-locking.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/smbstatus-locking.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -1,19 +1,26 @@
-Goal: exit without error from smbstatus when no connections have
- been seen yet
+Goal: Unknown
-Fixes: #164489. Patch later corrected in #164179
+Fixes: Maybe #164179?
-Status wrt upstream: Should be forwarded
+Status wrt upstream: Should maybe be forwarded
Note:
-Index: samba-3.0.25c/source/utils/status.c
+Index: samba-3.2.0pre1/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 @@
+--- samba-3.2.0pre1.orig/source/utils/status.c
++++ samba-3.2.0pre1/source/utils/status.c
+@@ -277,6 +277,7 @@
+ {
+ int c;
+ int profile_only = 0;
++ TDB_CONTEXT *tdb;
+ BOOL show_processes, show_locks, show_shares;
+ poptContext pc;
+ struct poptOption long_options[] = {
+@@ -405,6 +406,16 @@
if ( show_locks ) {
- int ret;
+ int result;
+ tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+
@@ -27,4 +34,4 @@
+
if (!locking_init(1)) {
d_printf("Can't initialise locking module - exiting\n");
- exit(1);
+ ret = 1;
Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch 2007-10-06 07:01:00 UTC (rev 1522)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch 2007-10-06 07:05:57 UTC (rev 1523)
@@ -9,16 +9,16 @@
Note:
-Index: samba-3.0.25c/source/Makefile.in
+Index: samba-3.2.0pre1/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
-@@ -1161,7 +1161,7 @@
+--- samba-3.2.0pre1.orig/source/Makefile.in
++++ samba-3.2.0pre1/source/Makefile.in
+@@ -1333,7 +1333,7 @@
- bin/libsmbclient. at SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
- @echo Linking libsmbclient shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -Wl,-z,defs -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
+ bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBS) \
++ @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+ @SONAMEFLAG@`basename $@`.$(SONAME_VER)
More information about the Pkg-samba-maint
mailing list