[Pkg-samba-maint] r1053 - trunk/patches
Christian Perrier
bubulle at costa.debian.org
Tue Apr 25 09:37:39 UTC 2006
Author: bubulle
Date: 2006-04-25 09:37:38 +0000 (Tue, 25 Apr 2006)
New Revision: 1053
Modified:
trunk/patches/fhs.patch
Log:
vorlon is magic
"we need this tdb file to end up in /var/lib"
Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch 2006-04-25 09:28:42 UTC (rev 1052)
+++ trunk/patches/fhs.patch 2006-04-25 09:37:38 UTC (rev 1053)
@@ -1,7 +1,7 @@
Index: samba-3.0.23pre1/source/Makefile.in
===================================================================
---- samba-3.0.23pre1.orig/source/Makefile.in 2006-04-20 04:29:46.000000000 +0200
-+++ samba-3.0.23pre1/source/Makefile.in 2006-04-25 10:03:19.845925176 +0200
+--- samba-3.0.23pre1.orig/source/Makefile.in 2006-04-25 11:36:33.771519224 +0200
++++ samba-3.0.23pre1/source/Makefile.in 2006-04-25 11:36:44.331913800 +0200
@@ -100,6 +100,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -36,8 +36,8 @@
@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
Index: samba-3.0.23pre1/source/configure.in
===================================================================
---- samba-3.0.23pre1.orig/source/configure.in 2006-04-20 04:29:46.000000000 +0200
-+++ samba-3.0.23pre1/source/configure.in 2006-04-25 10:02:34.109878112 +0200
+--- samba-3.0.23pre1.orig/source/configure.in 2006-04-25 11:36:33.772519072 +0200
++++ samba-3.0.23pre1/source/configure.in 2006-04-25 11:36:44.340912432 +0200
@@ -37,7 +37,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -70,8 +70,8 @@
Index: samba-3.0.23pre1/source/dynconfig.c
===================================================================
---- samba-3.0.23pre1.orig/source/dynconfig.c 2005-02-25 18:59:43.000000000 +0100
-+++ samba-3.0.23pre1/source/dynconfig.c 2006-04-25 10:01:58.903230336 +0200
+--- samba-3.0.23pre1.orig/source/dynconfig.c 2006-04-25 11:36:33.772519072 +0200
++++ samba-3.0.23pre1/source/dynconfig.c 2006-04-25 11:36:44.341912280 +0200
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -116,8 +116,8 @@
+}
Index: samba-3.0.23pre1/source/groupdb/mapping.c
===================================================================
---- samba-3.0.23pre1.orig/source/groupdb/mapping.c 2006-04-20 04:29:21.000000000 +0200
-+++ samba-3.0.23pre1/source/groupdb/mapping.c 2006-04-25 10:05:25.162874104 +0200
+--- samba-3.0.23pre1.orig/source/groupdb/mapping.c 2006-04-25 11:36:33.773518920 +0200
++++ samba-3.0.23pre1/source/groupdb/mapping.c 2006-04-25 11:36:44.344911824 +0200
@@ -56,7 +56,7 @@
if (tdb)
return True;
@@ -129,8 +129,8 @@
return False;
Index: samba-3.0.23pre1/source/include/dynconfig.h
===================================================================
---- samba-3.0.23pre1.orig/source/include/dynconfig.h 2005-02-25 18:59:39.000000000 +0100
-+++ samba-3.0.23pre1/source/include/dynconfig.h 2006-04-25 10:01:58.908229576 +0200
+--- samba-3.0.23pre1.orig/source/include/dynconfig.h 2006-04-25 11:36:33.774518768 +0200
++++ samba-3.0.23pre1/source/include/dynconfig.h 2006-04-25 11:36:44.345911672 +0200
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -146,8 +146,8 @@
+char *dyn_CACHEDIR(void);
Index: samba-3.0.23pre1/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.23pre1.orig/source/intl/lang_tdb.c 2006-04-20 04:29:23.000000000 +0200
-+++ samba-3.0.23pre1/source/intl/lang_tdb.c 2006-04-25 10:01:58.909229424 +0200
+--- samba-3.0.23pre1.orig/source/intl/lang_tdb.c 2006-04-25 11:36:33.775518616 +0200
++++ samba-3.0.23pre1/source/intl/lang_tdb.c 2006-04-25 11:36:44.346911520 +0200
@@ -131,7 +131,7 @@
if (!lang)
return True;
@@ -159,8 +159,8 @@
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
Index: samba-3.0.23pre1/source/lib/util.c
===================================================================
---- samba-3.0.23pre1.orig/source/lib/util.c 2006-04-20 04:29:23.000000000 +0200
-+++ samba-3.0.23pre1/source/lib/util.c 2006-04-25 10:01:58.914228664 +0200
+--- samba-3.0.23pre1.orig/source/lib/util.c 2006-04-25 11:36:33.776518464 +0200
++++ samba-3.0.23pre1/source/lib/util.c 2006-04-25 11:36:44.351910760 +0200
@@ -2561,6 +2561,61 @@
}
@@ -225,8 +225,8 @@
* @retval Pointer to a static #fstring containing the extension.
Index: samba-3.0.23pre1/source/lib/util_unistr.c
===================================================================
---- samba-3.0.23pre1.orig/source/lib/util_unistr.c 2006-04-20 04:29:23.000000000 +0200
-+++ samba-3.0.23pre1/source/lib/util_unistr.c 2006-04-25 10:06:14.844321376 +0200
+--- samba-3.0.23pre1.orig/source/lib/util_unistr.c 2006-04-25 11:36:33.778518160 +0200
++++ samba-3.0.23pre1/source/lib/util_unistr.c 2006-04-25 11:36:44.353910456 +0200
@@ -88,10 +88,10 @@
}
initialised = 1;
@@ -251,8 +251,8 @@
mapped_file = 1;
Index: samba-3.0.23pre1/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.23pre1.orig/source/libsmb/samlogon_cache.c 2006-04-20 04:29:25.000000000 +0200
-+++ samba-3.0.23pre1/source/libsmb/samlogon_cache.c 2006-04-25 10:01:58.920227752 +0200
+--- samba-3.0.23pre1.orig/source/libsmb/samlogon_cache.c 2006-04-25 11:36:33.779518008 +0200
++++ samba-3.0.23pre1/source/libsmb/samlogon_cache.c 2006-04-25 11:36:44.355910152 +0200
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -273,8 +273,8 @@
DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
Index: samba-3.0.23pre1/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.23pre1.orig/source/nmbd/nmbd_serverlistdb.c 2005-02-25 18:59:37.000000000 +0100
-+++ samba-3.0.23pre1/source/nmbd/nmbd_serverlistdb.c 2006-04-25 10:01:58.923227296 +0200
+--- samba-3.0.23pre1.orig/source/nmbd/nmbd_serverlistdb.c 2006-04-25 11:36:33.780517856 +0200
++++ samba-3.0.23pre1/source/nmbd/nmbd_serverlistdb.c 2006-04-25 11:36:44.356910000 +0200
@@ -327,7 +327,7 @@
updatecount++;
@@ -286,8 +286,8 @@
pstrcat(fname,SERVER_LIST);
Index: samba-3.0.23pre1/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.23pre1.orig/source/nmbd/nmbd_winsserver.c 2006-04-20 04:29:33.000000000 +0200
-+++ samba-3.0.23pre1/source/nmbd/nmbd_winsserver.c 2006-04-25 10:01:58.928226536 +0200
+--- samba-3.0.23pre1.orig/source/nmbd/nmbd_winsserver.c 2006-04-25 11:36:33.781517704 +0200
++++ samba-3.0.23pre1/source/nmbd/nmbd_winsserver.c 2006-04-25 11:36:44.361909240 +0200
@@ -559,7 +559,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -308,8 +308,8 @@
Index: samba-3.0.23pre1/source/passdb/login_cache.c
===================================================================
---- samba-3.0.23pre1.orig/source/passdb/login_cache.c 2006-04-20 04:29:28.000000000 +0200
-+++ samba-3.0.23pre1/source/passdb/login_cache.c 2006-04-25 10:01:58.929226384 +0200
+--- samba-3.0.23pre1.orig/source/passdb/login_cache.c 2006-04-25 11:36:33.782517552 +0200
++++ samba-3.0.23pre1/source/passdb/login_cache.c 2006-04-25 11:36:44.362909088 +0200
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -321,8 +321,8 @@
else {
Index: samba-3.0.23pre1/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.23pre1.orig/source/nsswitch/winbindd_cache.c 2006-04-20 04:29:21.000000000 +0200
-+++ samba-3.0.23pre1/source/nsswitch/winbindd_cache.c 2006-04-25 10:09:13.095223120 +0200
+--- samba-3.0.23pre1.orig/source/nsswitch/winbindd_cache.c 2006-04-25 11:36:33.785517096 +0200
++++ samba-3.0.23pre1/source/nsswitch/winbindd_cache.c 2006-04-25 11:36:44.366908480 +0200
@@ -1883,7 +1883,7 @@
return True;
@@ -343,8 +343,8 @@
Index: samba-3.0.23pre1/source/nsswitch/winbindd_util.c
===================================================================
---- samba-3.0.23pre1.orig/source/nsswitch/winbindd_util.c 2006-04-20 04:29:21.000000000 +0200
-+++ samba-3.0.23pre1/source/nsswitch/winbindd_util.c 2006-04-25 10:01:58.942224408 +0200
+--- samba-3.0.23pre1.orig/source/nsswitch/winbindd_util.c 2006-04-25 11:36:33.786516944 +0200
++++ samba-3.0.23pre1/source/nsswitch/winbindd_util.c 2006-04-25 11:36:44.368908176 +0200
@@ -1175,7 +1175,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -356,8 +356,8 @@
/* nothing to convert return */
Index: samba-3.0.23pre1/source/param/loadparm.c
===================================================================
---- samba-3.0.23pre1.orig/source/param/loadparm.c 2006-04-20 04:29:20.000000000 +0200
-+++ samba-3.0.23pre1/source/param/loadparm.c 2006-04-25 10:01:58.951223040 +0200
+--- samba-3.0.23pre1.orig/source/param/loadparm.c 2006-04-25 11:36:33.787516792 +0200
++++ samba-3.0.23pre1/source/param/loadparm.c 2006-04-25 11:36:44.378906656 +0200
@@ -108,6 +108,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -384,8 +384,8 @@
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
Index: samba-3.0.23pre1/source/passdb/secrets.c
===================================================================
---- samba-3.0.23pre1.orig/source/passdb/secrets.c 2006-04-20 04:29:28.000000000 +0200
-+++ samba-3.0.23pre1/source/passdb/secrets.c 2006-04-25 10:01:58.959221824 +0200
+--- samba-3.0.23pre1.orig/source/passdb/secrets.c 2006-04-25 11:36:33.784517248 +0200
++++ samba-3.0.23pre1/source/passdb/secrets.c 2006-04-25 11:36:44.381906200 +0200
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -398,8 +398,8 @@
Index: samba-3.0.23pre1/source/printing/nt_printing.c
===================================================================
---- samba-3.0.23pre1.orig/source/printing/nt_printing.c 2006-04-20 04:29:19.000000000 +0200
-+++ samba-3.0.23pre1/source/printing/nt_printing.c 2006-04-25 10:01:58.968220456 +0200
+--- samba-3.0.23pre1.orig/source/printing/nt_printing.c 2006-04-25 11:36:33.788516640 +0200
++++ samba-3.0.23pre1/source/printing/nt_printing.c 2006-04-25 11:36:44.390904832 +0200
@@ -530,28 +530,28 @@
if (tdb_drivers)
@@ -446,8 +446,8 @@
Index: samba-3.0.23pre1/source/printing/printing.c
===================================================================
---- samba-3.0.23pre1.orig/source/printing/printing.c 2006-04-20 04:29:19.000000000 +0200
-+++ samba-3.0.23pre1/source/printing/printing.c 2006-04-25 10:01:58.972219848 +0200
+--- samba-3.0.23pre1.orig/source/printing/printing.c 2006-04-25 11:36:33.809513448 +0200
++++ samba-3.0.23pre1/source/printing/printing.c 2006-04-25 11:36:44.395904072 +0200
@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -461,8 +461,8 @@
/* handle a Samba upgrade */
Index: samba-3.0.23pre1/source/printing/printing_db.c
===================================================================
---- samba-3.0.23pre1.orig/source/printing/printing_db.c 2005-10-18 04:44:57.000000000 +0200
-+++ samba-3.0.23pre1/source/printing/printing_db.c 2006-04-25 10:01:58.974219544 +0200
+--- samba-3.0.23pre1.orig/source/printing/printing_db.c 2006-04-25 11:36:33.809513448 +0200
++++ samba-3.0.23pre1/source/printing/printing_db.c 2006-04-25 11:36:44.396903920 +0200
@@ -89,7 +89,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -474,8 +474,8 @@
Index: samba-3.0.23pre1/source/sam/idmap_tdb.c
===================================================================
---- samba-3.0.23pre1.orig/source/sam/idmap_tdb.c 2006-04-20 04:29:35.000000000 +0200
-+++ samba-3.0.23pre1/source/sam/idmap_tdb.c 2006-04-25 10:01:58.982218328 +0200
+--- samba-3.0.23pre1.orig/source/sam/idmap_tdb.c 2006-04-25 11:36:33.810513296 +0200
++++ samba-3.0.23pre1/source/sam/idmap_tdb.c 2006-04-25 11:36:44.397903768 +0200
@@ -449,7 +449,7 @@
BOOL tdb_is_new = False;
@@ -487,8 +487,8 @@
return NT_STATUS_NO_MEMORY;
Index: samba-3.0.23pre1/source/smbd/lanman.c
===================================================================
---- samba-3.0.23pre1.orig/source/smbd/lanman.c 2006-04-20 04:29:18.000000000 +0200
-+++ samba-3.0.23pre1/source/smbd/lanman.c 2006-04-25 10:04:13.402783296 +0200
+--- samba-3.0.23pre1.orig/source/smbd/lanman.c 2006-04-25 11:36:33.811513144 +0200
++++ samba-3.0.23pre1/source/smbd/lanman.c 2006-04-25 11:36:44.403902856 +0200
@@ -1052,9 +1052,9 @@
BOOL local_list_only;
int i;
@@ -503,8 +503,8 @@
Index: samba-3.0.23pre1/source/utils/net_idmap.c
===================================================================
---- samba-3.0.23pre1.orig/source/utils/net_idmap.c 2006-01-25 00:46:40.000000000 +0100
-+++ samba-3.0.23pre1/source/utils/net_idmap.c 2006-04-25 10:01:59.012213768 +0200
+--- samba-3.0.23pre1.orig/source/utils/net_idmap.c 2006-04-25 11:36:33.812512992 +0200
++++ samba-3.0.23pre1/source/utils/net_idmap.c 2006-04-25 11:36:44.405902552 +0200
@@ -136,7 +136,7 @@
return NT_STATUS_UNSUCCESSFUL;
}
@@ -516,8 +516,8 @@
return NT_STATUS_NO_MEMORY;
Index: samba-3.0.23pre1/source/registry/reg_db.c
===================================================================
---- samba-3.0.23pre1.orig/source/registry/reg_db.c 2006-04-20 04:29:45.000000000 +0200
-+++ samba-3.0.23pre1/source/registry/reg_db.c 2006-04-25 10:01:59.015213312 +0200
+--- samba-3.0.23pre1.orig/source/registry/reg_db.c 2006-04-25 11:36:33.813512840 +0200
++++ samba-3.0.23pre1/source/registry/reg_db.c 2006-04-25 11:36:44.407902248 +0200
@@ -205,12 +205,12 @@
if ( tdb_reg )
return True;
@@ -550,8 +550,8 @@
unbecome_root();
Index: samba-3.0.23pre1/source/lib/account_pol.c
===================================================================
---- samba-3.0.23pre1.orig/source/lib/account_pol.c 2006-04-20 04:29:23.000000000 +0200
-+++ samba-3.0.23pre1/source/lib/account_pol.c 2006-04-25 10:01:59.016213160 +0200
+--- samba-3.0.23pre1.orig/source/lib/account_pol.c 2006-04-25 11:36:33.778518160 +0200
++++ samba-3.0.23pre1/source/lib/account_pol.c 2006-04-25 11:36:44.409901944 +0200
@@ -262,7 +262,7 @@
return True;
}
@@ -563,8 +563,8 @@
return False;
Index: samba-3.0.23pre1/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.23pre1.orig/source/registry/reg_perfcount.c 2006-04-20 04:29:45.000000000 +0200
-+++ samba-3.0.23pre1/source/registry/reg_perfcount.c 2006-04-25 10:01:59.019212704 +0200
+--- samba-3.0.23pre1.orig/source/registry/reg_perfcount.c 2006-04-25 11:36:33.813512840 +0200
++++ samba-3.0.23pre1/source/registry/reg_perfcount.c 2006-04-25 11:36:44.412901488 +0200
@@ -44,7 +44,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -585,8 +585,8 @@
Index: samba-3.0.23pre1/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.23pre1.orig/source/rpc_server/srv_eventlog_lib.c 2006-04-20 04:29:27.000000000 +0200
-+++ samba-3.0.23pre1/source/rpc_server/srv_eventlog_lib.c 2006-04-25 10:01:59.021212400 +0200
+--- samba-3.0.23pre1.orig/source/rpc_server/srv_eventlog_lib.c 2006-04-25 11:36:33.815512536 +0200
++++ samba-3.0.23pre1/source/rpc_server/srv_eventlog_lib.c 2006-04-25 11:36:44.414901184 +0200
@@ -67,7 +67,7 @@
{
fstring path;
@@ -605,3 +605,16 @@
if ( !directory_exist( eventlogdir, NULL ) )
mkdir( eventlogdir, 0755 );
+Index: samba-3.0.23pre1/source/passdb/pdb_tdb.c
+===================================================================
+--- samba-3.0.23pre1.orig/source/passdb/pdb_tdb.c 2006-04-25 11:29:48.000000000 +0200
++++ samba-3.0.23pre1/source/passdb/pdb_tdb.c 2006-04-25 11:37:34.633266832 +0200
+@@ -1591,7 +1591,7 @@
+ /* save the path for later */
+
+ if ( !location ) {
+- pstr_sprintf( tdbfile, "%s/%s", lp_private_dir(), PASSDB_FILE_NAME );
++ pstr_sprintf( tdbfile, "%s/%s", dyn_STATEDIR(), PASSDB_FILE_NAME );
+ pfile = tdbfile;
+ }
+ pstrcpy( tdbsam_filename, pfile );
More information about the Pkg-samba-maint
mailing list