[Pkg-samba-maint] r963 - in trunk: . patches
Steve Langasek
vorlon at costa.debian.org
Fri Jan 20 08:01:03 UTC 2006
Author: vorlon
Date: 2006-01-20 08:01:02 +0000 (Fri, 20 Jan 2006)
New Revision: 963
Modified:
trunk/changelog
trunk/patches/fhs.patch
Log:
fix new references to registry.tdb
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-01-18 15:55:19 UTC (rev 962)
+++ trunk/changelog 2006-01-20 08:01:02 UTC (rev 963)
@@ -20,6 +20,8 @@
- move changes to autogenerated files into their own patch now that we've
lost the script that was calling autogen.sh for us; this also helps
make debian/rules clean just a little bit cleaner.
+ * debian/patches/fhs.patch:
+ - fix new references to registry.tdb (closes: #348874).
-- Steve Langasek <vorlon at debian.org> Wed, 18 Jan 2006 07:43:15 -0800
Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch 2006-01-18 15:55:19 UTC (rev 962)
+++ trunk/patches/fhs.patch 2006-01-20 08:01:02 UTC (rev 963)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/Makefile.in
+Index: samba-3.0.21a/source/Makefile.in
===================================================================
---- samba-3.0.21a.new.orig/source/Makefile.in 2005-12-14 13:45:49.000000000 +0100
-+++ samba-3.0.21a.new/source/Makefile.in 2006-01-02 09:58:55.739279718 +0100
+--- samba-3.0.21a.orig/source/Makefile.in 2005-12-14 04:45:49.000000000 -0800
++++ samba-3.0.21a/source/Makefile.in 2006-01-19 23:59:50.000000000 -0800
@@ -91,6 +91,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -34,10 +34,10 @@
installmsg: installdirs
@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
-Index: samba-3.0.21a.new/source/configure.in
+Index: samba-3.0.21a/source/configure.in
===================================================================
---- samba-3.0.21a.new.orig/source/configure.in 2005-12-14 13:45:51.000000000 +0100
-+++ samba-3.0.21a.new/source/configure.in 2006-01-02 09:58:49.949449984 +0100
+--- samba-3.0.21a.orig/source/configure.in 2005-12-14 04:45:51.000000000 -0800
++++ samba-3.0.21a/source/configure.in 2006-01-19 23:59:50.000000000 -0800
@@ -35,7 +35,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -68,10 +68,10 @@
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
-Index: samba-3.0.21a.new/source/dynconfig.c
+Index: samba-3.0.21a/source/dynconfig.c
===================================================================
---- samba-3.0.21a.new.orig/source/dynconfig.c 2005-02-25 18:59:43.000000000 +0100
-+++ samba-3.0.21a.new/source/dynconfig.c 2006-01-02 09:43:36.356337494 +0100
+--- samba-3.0.21a.orig/source/dynconfig.c 2005-02-25 09:59:43.000000000 -0800
++++ samba-3.0.21a/source/dynconfig.c 2006-01-19 23:59:50.000000000 -0800
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -114,10 +114,10 @@
+ return lp_lockdir();
+#endif
+}
-Index: samba-3.0.21a.new/source/groupdb/mapping.c
+Index: samba-3.0.21a/source/groupdb/mapping.c
===================================================================
---- samba-3.0.21a.new.orig/source/groupdb/mapping.c 2005-11-09 19:28:57.000000000 +0100
-+++ samba-3.0.21a.new/source/groupdb/mapping.c 2006-01-02 09:43:36.357337292 +0100
+--- samba-3.0.21a.orig/source/groupdb/mapping.c 2005-11-09 10:28:57.000000000 -0800
++++ samba-3.0.21a/source/groupdb/mapping.c 2006-01-19 23:59:50.000000000 -0800
@@ -129,7 +129,7 @@
if (tdb)
@@ -127,10 +127,10 @@
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-Index: samba-3.0.21a.new/source/include/dynconfig.h
+Index: samba-3.0.21a/source/include/dynconfig.h
===================================================================
---- samba-3.0.21a.new.orig/source/include/dynconfig.h 2005-02-25 18:59:39.000000000 +0100
-+++ samba-3.0.21a.new/source/include/dynconfig.h 2006-01-02 09:43:36.358337089 +0100
+--- samba-3.0.21a.orig/source/include/dynconfig.h 2005-02-25 09:59:39.000000000 -0800
++++ samba-3.0.21a/source/include/dynconfig.h 2006-01-19 23:59:50.000000000 -0800
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -144,10 +144,10 @@
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-Index: samba-3.0.21a.new/source/intl/lang_tdb.c
+Index: samba-3.0.21a/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.21a.new.orig/source/intl/lang_tdb.c 2005-07-28 15:19:45.000000000 +0200
-+++ samba-3.0.21a.new/source/intl/lang_tdb.c 2006-01-02 09:43:36.358337089 +0100
+--- samba-3.0.21a.orig/source/intl/lang_tdb.c 2005-07-28 06:19:45.000000000 -0700
++++ samba-3.0.21a/source/intl/lang_tdb.c 2006-01-19 23:59:50.000000000 -0800
@@ -128,7 +128,7 @@
if (!lang)
return True;
@@ -157,10 +157,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.21a.new/source/lib/util.c
+Index: samba-3.0.21a/source/lib/util.c
===================================================================
---- samba-3.0.21a.new.orig/source/lib/util.c 2005-12-20 16:28:38.000000000 +0100
-+++ samba-3.0.21a.new/source/lib/util.c 2006-01-02 09:43:36.369334863 +0100
+--- samba-3.0.21a.orig/source/lib/util.c 2005-12-20 07:28:38.000000000 -0800
++++ samba-3.0.21a/source/lib/util.c 2006-01-19 23:59:50.000000000 -0800
@@ -2410,6 +2410,61 @@
}
@@ -223,10 +223,10 @@
* @brief Returns the platform specific shared library extension.
*
* @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.21a.new/source/lib/util_unistr.c
+Index: samba-3.0.21a/source/lib/util_unistr.c
===================================================================
---- samba-3.0.21a.new.orig/source/lib/util_unistr.c 2005-12-02 20:21:45.000000000 +0100
-+++ samba-3.0.21a.new/source/lib/util_unistr.c 2006-01-02 09:43:36.370334661 +0100
+--- samba-3.0.21a.orig/source/lib/util_unistr.c 2005-12-02 11:21:45.000000000 -0800
++++ samba-3.0.21a/source/lib/util_unistr.c 2006-01-19 23:59:50.000000000 -0800
@@ -58,8 +58,8 @@
}
initialised = 1;
@@ -247,10 +247,10 @@
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-Index: samba-3.0.21a.new/source/libsmb/samlogon_cache.c
+Index: samba-3.0.21a/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.21a.new.orig/source/libsmb/samlogon_cache.c 2005-11-11 23:10:32.000000000 +0100
-+++ samba-3.0.21a.new/source/libsmb/samlogon_cache.c 2006-01-02 09:43:36.371334459 +0100
+--- samba-3.0.21a.orig/source/libsmb/samlogon_cache.c 2005-11-11 14:10:32.000000000 -0800
++++ samba-3.0.21a/source/libsmb/samlogon_cache.c 2006-01-19 23:59:50.000000000 -0800
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -269,10 +269,10 @@
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-Index: samba-3.0.21a.new/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.21a/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.21a.new.orig/source/nmbd/nmbd_serverlistdb.c 2005-02-25 18:59:37.000000000 +0100
-+++ samba-3.0.21a.new/source/nmbd/nmbd_serverlistdb.c 2006-01-02 09:43:36.372334256 +0100
+--- samba-3.0.21a.orig/source/nmbd/nmbd_serverlistdb.c 2005-02-25 09:59:37.000000000 -0800
++++ samba-3.0.21a/source/nmbd/nmbd_serverlistdb.c 2006-01-19 23:59:50.000000000 -0800
@@ -327,7 +327,7 @@
updatecount++;
@@ -282,10 +282,10 @@
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.21a.new/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.21a/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.21a.new.orig/source/nmbd/nmbd_winsserver.c 2005-11-09 19:29:00.000000000 +0100
-+++ samba-3.0.21a.new/source/nmbd/nmbd_winsserver.c 2006-01-02 09:43:36.374333852 +0100
+--- samba-3.0.21a.orig/source/nmbd/nmbd_winsserver.c 2005-11-09 10:29:00.000000000 -0800
++++ samba-3.0.21a/source/nmbd/nmbd_winsserver.c 2006-01-19 23:59:50.000000000 -0800
@@ -234,7 +234,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -304,10 +304,10 @@
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-Index: samba-3.0.21a.new/source/passdb/login_cache.c
+Index: samba-3.0.21a/source/passdb/login_cache.c
===================================================================
---- samba-3.0.21a.new.orig/source/passdb/login_cache.c 2005-02-25 18:59:36.000000000 +0100
-+++ samba-3.0.21a.new/source/passdb/login_cache.c 2006-01-02 09:43:36.380332637 +0100
+--- samba-3.0.21a.orig/source/passdb/login_cache.c 2005-02-25 09:59:36.000000000 -0800
++++ samba-3.0.21a/source/passdb/login_cache.c 2006-01-19 23:59:50.000000000 -0800
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -317,10 +317,10 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.0.21a.new/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.21a/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.21a.new.orig/source/nsswitch/winbindd_cache.c 2005-12-14 13:45:50.000000000 +0100
-+++ samba-3.0.21a.new/source/nsswitch/winbindd_cache.c 2006-01-02 09:43:36.381332435 +0100
+--- samba-3.0.21a.orig/source/nsswitch/winbindd_cache.c 2005-12-14 04:45:50.000000000 -0800
++++ samba-3.0.21a/source/nsswitch/winbindd_cache.c 2006-01-19 23:59:50.000000000 -0800
@@ -58,7 +58,7 @@
if (opt_nocache)
return;
@@ -339,10 +339,10 @@
TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
if (wcache->tdb == NULL) {
-Index: samba-3.0.21a.new/source/nsswitch/winbindd_util.c
+Index: samba-3.0.21a/source/nsswitch/winbindd_util.c
===================================================================
---- samba-3.0.21a.new.orig/source/nsswitch/winbindd_util.c 2005-12-14 13:45:50.000000000 +0100
-+++ samba-3.0.21a.new/source/nsswitch/winbindd_util.c 2006-01-02 09:43:36.383332030 +0100
+--- samba-3.0.21a.orig/source/nsswitch/winbindd_util.c 2005-12-14 04:45:50.000000000 -0800
++++ samba-3.0.21a/source/nsswitch/winbindd_util.c 2006-01-19 23:59:50.000000000 -0800
@@ -1173,7 +1173,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -352,10 +352,10 @@
if (!file_exist(idmap_name, &stbuf)) {
/* nothing to convert return */
-Index: samba-3.0.21a.new/source/param/loadparm.c
+Index: samba-3.0.21a/source/param/loadparm.c
===================================================================
---- samba-3.0.21a.new.orig/source/param/loadparm.c 2005-12-02 20:21:45.000000000 +0100
-+++ samba-3.0.21a.new/source/param/loadparm.c 2006-01-02 09:43:36.388331018 +0100
+--- samba-3.0.21a.orig/source/param/loadparm.c 2005-12-02 11:21:45.000000000 -0800
++++ samba-3.0.21a/source/param/loadparm.c 2006-01-19 23:59:50.000000000 -0800
@@ -105,6 +105,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -380,10 +380,10 @@
{"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},
-Index: samba-3.0.21a.new/source/passdb/pdb_tdb.c
+Index: samba-3.0.21a/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.21a.new.orig/source/passdb/pdb_tdb.c 2005-11-09 19:28:59.000000000 +0100
-+++ samba-3.0.21a.new/source/passdb/pdb_tdb.c 2006-01-02 09:43:36.389330816 +0100
+--- samba-3.0.21a.orig/source/passdb/pdb_tdb.c 2005-11-09 10:28:59.000000000 -0800
++++ samba-3.0.21a/source/passdb/pdb_tdb.c 2006-01-19 23:59:50.000000000 -0800
@@ -917,10 +917,7 @@
if (location) {
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
@@ -396,10 +396,10 @@
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
}
-Index: samba-3.0.21a.new/source/passdb/secrets.c
+Index: samba-3.0.21a/source/passdb/secrets.c
===================================================================
---- samba-3.0.21a.new.orig/source/passdb/secrets.c 2005-10-18 04:45:02.000000000 +0200
-+++ samba-3.0.21a.new/source/passdb/secrets.c 2006-01-02 09:43:36.391330411 +0100
+--- samba-3.0.21a.orig/source/passdb/secrets.c 2005-10-17 19:45:02.000000000 -0700
++++ samba-3.0.21a/source/passdb/secrets.c 2006-01-19 23:59:50.000000000 -0800
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -410,10 +410,10 @@
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.21a.new/source/printing/nt_printing.c
+Index: samba-3.0.21a/source/printing/nt_printing.c
===================================================================
---- samba-3.0.21a.new.orig/source/printing/nt_printing.c 2005-11-09 19:28:56.000000000 +0100
-+++ samba-3.0.21a.new/source/printing/nt_printing.c 2006-01-02 09:43:36.416325352 +0100
+--- samba-3.0.21a.orig/source/printing/nt_printing.c 2005-11-09 10:28:56.000000000 -0800
++++ samba-3.0.21a/source/printing/nt_printing.c 2006-01-19 23:59:50.000000000 -0800
@@ -530,28 +530,28 @@
if (tdb_drivers)
@@ -458,10 +458,10 @@
pstrcat(printdb_path, sharename);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.21a.new/source/printing/printing.c
+Index: samba-3.0.21a/source/printing/printing.c
===================================================================
---- samba-3.0.21a.new.orig/source/printing/printing.c 2005-10-18 04:44:57.000000000 +0200
-+++ samba-3.0.21a.new/source/printing/printing.c 2006-01-02 09:43:36.400328590 +0100
+--- samba-3.0.21a.orig/source/printing/printing.c 2005-10-17 19:44:57.000000000 -0700
++++ samba-3.0.21a/source/printing/printing.c 2006-01-19 23:59:50.000000000 -0800
@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -473,10 +473,10 @@
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-Index: samba-3.0.21a.new/source/printing/printing_db.c
+Index: samba-3.0.21a/source/printing/printing_db.c
===================================================================
---- samba-3.0.21a.new.orig/source/printing/printing_db.c 2005-10-18 04:44:57.000000000 +0200
-+++ samba-3.0.21a.new/source/printing/printing_db.c 2006-01-02 09:43:36.400328590 +0100
+--- samba-3.0.21a.orig/source/printing/printing_db.c 2005-10-17 19:44:57.000000000 -0700
++++ samba-3.0.21a/source/printing/printing_db.c 2006-01-19 23:59:50.000000000 -0800
@@ -89,7 +89,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -486,10 +486,10 @@
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.21a.new/source/rpc_server/srv_srvsvc_nt.c
+Index: samba-3.0.21a/source/rpc_server/srv_srvsvc_nt.c
===================================================================
---- samba-3.0.21a.new.orig/source/rpc_server/srv_srvsvc_nt.c 2005-12-14 13:45:50.000000000 +0100
-+++ samba-3.0.21a.new/source/rpc_server/srv_srvsvc_nt.c 2006-01-02 09:43:36.404327781 +0100
+--- samba-3.0.21a.orig/source/rpc_server/srv_srvsvc_nt.c 2005-12-14 04:45:50.000000000 -0800
++++ samba-3.0.21a/source/rpc_server/srv_srvsvc_nt.c 2006-01-19 23:59:50.000000000 -0800
@@ -156,10 +156,10 @@
if (share_tdb && local_pid == sys_getpid())
@@ -503,10 +503,10 @@
return False;
}
-Index: samba-3.0.21a.new/source/sam/idmap_tdb.c
+Index: samba-3.0.21a/source/sam/idmap_tdb.c
===================================================================
---- samba-3.0.21a.new.orig/source/sam/idmap_tdb.c 2005-02-25 18:59:38.000000000 +0100
-+++ samba-3.0.21a.new/source/sam/idmap_tdb.c 2006-01-02 09:43:36.405327578 +0100
+--- samba-3.0.21a.orig/source/sam/idmap_tdb.c 2005-02-25 09:59:38.000000000 -0800
++++ samba-3.0.21a/source/sam/idmap_tdb.c 2006-01-19 23:59:50.000000000 -0800
@@ -487,7 +487,7 @@
BOOL tdb_is_new = False;
@@ -516,10 +516,10 @@
if (!tdbfile) {
DEBUG(0, ("idmap_init: out of memory!\n"));
return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.21a.new/source/smbd/lanman.c
+Index: samba-3.0.21a/source/smbd/lanman.c
===================================================================
---- samba-3.0.21a.new.orig/source/smbd/lanman.c 2005-11-09 19:28:55.000000000 +0100
-+++ samba-3.0.21a.new/source/smbd/lanman.c 2006-01-02 09:43:36.409326769 +0100
+--- samba-3.0.21a.orig/source/smbd/lanman.c 2005-11-09 10:28:55.000000000 -0800
++++ samba-3.0.21a/source/smbd/lanman.c 2006-01-19 23:59:50.000000000 -0800
@@ -1040,9 +1040,9 @@
BOOL local_list_only;
int i;
@@ -532,10 +532,10 @@
return(0);
}
-Index: samba-3.0.21a.new/source/utils/net_idmap.c
+Index: samba-3.0.21a/source/utils/net_idmap.c
===================================================================
---- samba-3.0.21a.new.orig/source/utils/net_idmap.c 2005-11-09 19:29:02.000000000 +0100
-+++ samba-3.0.21a.new/source/utils/net_idmap.c 2006-01-02 09:43:36.410326566 +0100
+--- samba-3.0.21a.orig/source/utils/net_idmap.c 2005-11-09 10:29:02.000000000 -0800
++++ samba-3.0.21a/source/utils/net_idmap.c 2006-01-19 23:59:50.000000000 -0800
@@ -136,7 +136,7 @@
return NT_STATUS_UNSUCCESSFUL;
}
@@ -545,10 +545,10 @@
if (!tdbfile) {
DEBUG(0, ("idmap_init: out of memory!\n"));
return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.21a.new/source/wrepld/process.c
+Index: samba-3.0.21a/source/wrepld/process.c
===================================================================
---- samba-3.0.21a.new.orig/source/wrepld/process.c 2005-07-28 15:19:43.000000000 +0200
-+++ samba-3.0.21a.new/source/wrepld/process.c 2006-01-02 09:43:36.411326364 +0100
+--- samba-3.0.21a.orig/source/wrepld/process.c 2005-07-28 06:19:43.000000000 -0700
++++ samba-3.0.21a/source/wrepld/process.c 2006-01-19 23:59:50.000000000 -0800
@@ -197,7 +197,7 @@
{
TDB_CONTEXT *tdb;
@@ -567,10 +567,10 @@
if (!tdb) {
DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
return;
-Index: samba-3.0.21a.new/source/registry/reg_db.c
+Index: samba-3.0.21a/source/registry/reg_db.c
===================================================================
---- samba-3.0.21a.new.orig/source/registry/reg_db.c 2005-10-18 04:45:06.000000000 +0200
-+++ samba-3.0.21a.new/source/registry/reg_db.c 2006-01-02 09:45:35.192281636 +0100
+--- samba-3.0.21a.orig/source/registry/reg_db.c 2005-10-17 19:45:06.000000000 -0700
++++ samba-3.0.21a/source/registry/reg_db.c 2006-01-19 23:59:59.000000000 -0800
@@ -205,12 +205,12 @@
if ( tdb_reg )
return True;
@@ -587,3 +587,17 @@
return False;
}
+@@ -252,11 +252,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);
+ if ( !tdb_reg ) {
+ result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
+ DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",
+- lock_path("registry.tdb"), strerror(errno) ));
++ state_path("registry.tdb"), strerror(errno) ));
+ }
+
+ unbecome_root();
More information about the Pkg-samba-maint
mailing list