[Pkg-samba-maint] r964 - in trunk: . patches
Steve Langasek
vorlon at costa.debian.org
Fri Jan 20 11:44:52 UTC 2006
Author: vorlon
Date: 2006-01-20 11:44:51 +0000 (Fri, 20 Jan 2006)
New Revision: 964
Modified:
trunk/changelog
trunk/patches/fhs.patch
Log:
also move account_policy.tdb, perfcount, and eventlog into /var/lib/samba
where they belong
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-01-20 08:01:02 UTC (rev 963)
+++ trunk/changelog 2006-01-20 11:44:51 UTC (rev 964)
@@ -22,6 +22,8 @@
make debian/rules clean just a little bit cleaner.
* debian/patches/fhs.patch:
- fix new references to registry.tdb (closes: #348874).
+ - also move account_policy.tdb, perfcount, and eventlog into /var/lib/samba
+ where they belong
-- 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-20 08:01:02 UTC (rev 963)
+++ trunk/patches/fhs.patch 2006-01-20 11:44:51 UTC (rev 964)
@@ -1,7 +1,7 @@
Index: samba-3.0.21a/source/Makefile.in
===================================================================
--- 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
++++ samba-3.0.21a/source/Makefile.in 2006-01-20 02:58:22.000000000 -0800
@@ -91,6 +91,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -37,7 +37,7 @@
Index: samba-3.0.21a/source/configure.in
===================================================================
--- 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
++++ samba-3.0.21a/source/configure.in 2006-01-20 02:58:22.000000000 -0800
@@ -35,7 +35,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -71,7 +71,7 @@
Index: samba-3.0.21a/source/dynconfig.c
===================================================================
--- 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
++++ samba-3.0.21a/source/dynconfig.c 2006-01-20 02:58:22.000000000 -0800
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -117,7 +117,7 @@
Index: samba-3.0.21a/source/groupdb/mapping.c
===================================================================
--- 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
++++ samba-3.0.21a/source/groupdb/mapping.c 2006-01-20 02:58:22.000000000 -0800
@@ -129,7 +129,7 @@
if (tdb)
@@ -130,7 +130,7 @@
Index: samba-3.0.21a/source/include/dynconfig.h
===================================================================
--- 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
++++ samba-3.0.21a/source/include/dynconfig.h 2006-01-20 02:58:22.000000000 -0800
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -147,7 +147,7 @@
Index: samba-3.0.21a/source/intl/lang_tdb.c
===================================================================
--- 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
++++ samba-3.0.21a/source/intl/lang_tdb.c 2006-01-20 02:58:22.000000000 -0800
@@ -128,7 +128,7 @@
if (!lang)
return True;
@@ -160,7 +160,7 @@
Index: samba-3.0.21a/source/lib/util.c
===================================================================
--- 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
++++ samba-3.0.21a/source/lib/util.c 2006-01-20 02:58:22.000000000 -0800
@@ -2410,6 +2410,61 @@
}
@@ -226,7 +226,7 @@
Index: samba-3.0.21a/source/lib/util_unistr.c
===================================================================
--- 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
++++ samba-3.0.21a/source/lib/util_unistr.c 2006-01-20 02:58:22.000000000 -0800
@@ -58,8 +58,8 @@
}
initialised = 1;
@@ -250,7 +250,7 @@
Index: samba-3.0.21a/source/libsmb/samlogon_cache.c
===================================================================
--- 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
++++ samba-3.0.21a/source/libsmb/samlogon_cache.c 2006-01-20 02:58:22.000000000 -0800
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -272,7 +272,7 @@
Index: samba-3.0.21a/source/nmbd/nmbd_serverlistdb.c
===================================================================
--- 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
++++ samba-3.0.21a/source/nmbd/nmbd_serverlistdb.c 2006-01-20 02:58:22.000000000 -0800
@@ -327,7 +327,7 @@
updatecount++;
@@ -285,7 +285,7 @@
Index: samba-3.0.21a/source/nmbd/nmbd_winsserver.c
===================================================================
--- 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
++++ samba-3.0.21a/source/nmbd/nmbd_winsserver.c 2006-01-20 02:58:22.000000000 -0800
@@ -234,7 +234,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -307,7 +307,7 @@
Index: samba-3.0.21a/source/passdb/login_cache.c
===================================================================
--- 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
++++ samba-3.0.21a/source/passdb/login_cache.c 2006-01-20 02:58:22.000000000 -0800
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -320,7 +320,7 @@
Index: samba-3.0.21a/source/nsswitch/winbindd_cache.c
===================================================================
--- 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
++++ samba-3.0.21a/source/nsswitch/winbindd_cache.c 2006-01-20 02:58:22.000000000 -0800
@@ -58,7 +58,7 @@
if (opt_nocache)
return;
@@ -342,7 +342,7 @@
Index: samba-3.0.21a/source/nsswitch/winbindd_util.c
===================================================================
--- 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
++++ samba-3.0.21a/source/nsswitch/winbindd_util.c 2006-01-20 02:58:22.000000000 -0800
@@ -1173,7 +1173,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -355,7 +355,7 @@
Index: samba-3.0.21a/source/param/loadparm.c
===================================================================
--- 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
++++ samba-3.0.21a/source/param/loadparm.c 2006-01-20 02:58:22.000000000 -0800
@@ -105,6 +105,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -383,7 +383,7 @@
Index: samba-3.0.21a/source/passdb/pdb_tdb.c
===================================================================
--- 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
++++ samba-3.0.21a/source/passdb/pdb_tdb.c 2006-01-20 02:58:22.000000000 -0800
@@ -917,10 +917,7 @@
if (location) {
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
@@ -399,7 +399,7 @@
Index: samba-3.0.21a/source/passdb/secrets.c
===================================================================
--- 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
++++ samba-3.0.21a/source/passdb/secrets.c 2006-01-20 02:58:22.000000000 -0800
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -413,7 +413,7 @@
Index: samba-3.0.21a/source/printing/nt_printing.c
===================================================================
--- 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
++++ samba-3.0.21a/source/printing/nt_printing.c 2006-01-20 02:58:22.000000000 -0800
@@ -530,28 +530,28 @@
if (tdb_drivers)
@@ -461,7 +461,7 @@
Index: samba-3.0.21a/source/printing/printing.c
===================================================================
--- 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
++++ samba-3.0.21a/source/printing/printing.c 2006-01-20 02:58:22.000000000 -0800
@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -476,7 +476,7 @@
Index: samba-3.0.21a/source/printing/printing_db.c
===================================================================
--- 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
++++ samba-3.0.21a/source/printing/printing_db.c 2006-01-20 02:58:22.000000000 -0800
@@ -89,7 +89,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -489,7 +489,7 @@
Index: samba-3.0.21a/source/rpc_server/srv_srvsvc_nt.c
===================================================================
--- 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
++++ samba-3.0.21a/source/rpc_server/srv_srvsvc_nt.c 2006-01-20 02:58:22.000000000 -0800
@@ -156,10 +156,10 @@
if (share_tdb && local_pid == sys_getpid())
@@ -506,7 +506,7 @@
Index: samba-3.0.21a/source/sam/idmap_tdb.c
===================================================================
--- 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
++++ samba-3.0.21a/source/sam/idmap_tdb.c 2006-01-20 02:58:22.000000000 -0800
@@ -487,7 +487,7 @@
BOOL tdb_is_new = False;
@@ -519,7 +519,7 @@
Index: samba-3.0.21a/source/smbd/lanman.c
===================================================================
--- 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
++++ samba-3.0.21a/source/smbd/lanman.c 2006-01-20 02:58:22.000000000 -0800
@@ -1040,9 +1040,9 @@
BOOL local_list_only;
int i;
@@ -535,7 +535,7 @@
Index: samba-3.0.21a/source/utils/net_idmap.c
===================================================================
--- 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
++++ samba-3.0.21a/source/utils/net_idmap.c 2006-01-20 02:58:22.000000000 -0800
@@ -136,7 +136,7 @@
return NT_STATUS_UNSUCCESSFUL;
}
@@ -548,7 +548,7 @@
Index: samba-3.0.21a/source/wrepld/process.c
===================================================================
--- 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
++++ samba-3.0.21a/source/wrepld/process.c 2006-01-20 02:58:22.000000000 -0800
@@ -197,7 +197,7 @@
{
TDB_CONTEXT *tdb;
@@ -570,7 +570,7 @@
Index: samba-3.0.21a/source/registry/reg_db.c
===================================================================
--- 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
++++ samba-3.0.21a/source/registry/reg_db.c 2006-01-20 02:58:22.000000000 -0800
@@ -205,12 +205,12 @@
if ( tdb_reg )
return True;
@@ -601,3 +601,60 @@
}
unbecome_root();
+Index: samba-3.0.21a/source/lib/account_pol.c
+===================================================================
+--- samba-3.0.21a.orig/source/lib/account_pol.c 2005-12-20 07:28:38.000000000 -0800
++++ samba-3.0.21a/source/lib/account_pol.c 2006-01-20 02:59:34.000000000 -0800
+@@ -262,7 +262,7 @@
+ return True;
+ }
+
+- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!tdb) {
+ DEBUG(0,("Failed to open account policy database\n"));
+ return False;
+Index: samba-3.0.21a/source/registry/reg_perfcount.c
+===================================================================
+--- samba-3.0.21a.orig/source/registry/reg_perfcount.c 2005-11-09 10:29:03.000000000 -0800
++++ samba-3.0.21a/source/registry/reg_perfcount.c 2006-01-20 02:58:46.000000000 -0800
+@@ -44,7 +44,7 @@
+
+ fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
+
+- pstrcpy( fname, lock_path( path ) );
++ pstrcpy( fname, state_path( path ) );
+
+ return fname;
+ }
+@@ -54,7 +54,7 @@
+
+ void perfcount_init_keys( void )
+ {
+- char *p = lock_path(PERFCOUNTDIR);
++ char *p = state_path(PERFCOUNTDIR);
+
+ /* no registry keys; just create the perfmon directory */
+
+Index: samba-3.0.21a/source/rpc_server/srv_eventlog_lib.c
+===================================================================
+--- samba-3.0.21a.orig/source/rpc_server/srv_eventlog_lib.c 2005-12-02 11:21:47.000000000 -0800
++++ samba-3.0.21a/source/rpc_server/srv_eventlog_lib.c 2006-01-20 02:59:15.000000000 -0800
+@@ -67,7 +67,7 @@
+ {
+ fstring path;
+ char *tdb_fullpath;
+- char *eventlogdir = lock_path( "eventlog" );
++ char *eventlogdir = state_path( "eventlog" );
+
+ pstr_sprintf( path, "%s/%s.tdb", eventlogdir, name );
+ strlower_m( path );
+@@ -343,7 +343,7 @@
+
+ /* make sure that the eventlog dir exists */
+
+- eventlogdir = lock_path( "eventlog" );
++ eventlogdir = state_path( "eventlog" );
+ if ( !directory_exist( eventlogdir, NULL ) )
+ mkdir( eventlogdir, 0755 );
+
More information about the Pkg-samba-maint
mailing list