From 5a595ccff88c59af42b7ac23ac5cf75e33104137 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 7 Feb 2005 08:43:18 +0000 Subject: r5257: Upadate patches and control files Sync up with 3.0.11 (This used to be commit ed61c84581b364e9d822871944c45a26c2f0e932) --- packaging/Debian/debian-stable/patches/fhs.patch | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'packaging/Debian/debian-stable/patches') diff --git a/packaging/Debian/debian-stable/patches/fhs.patch b/packaging/Debian/debian-stable/patches/fhs.patch index df6ddec2df..760306a3c3 100644 --- a/packaging/Debian/debian-stable/patches/fhs.patch +++ b/packaging/Debian/debian-stable/patches/fhs.patch @@ -380,18 +380,6 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/ tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile); } -diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/source/passdb/privileges.c ---- samba-3.0.0beta2.orig/source/passdb/privileges.c 2003-06-07 12:57:35.000000000 -0500 -+++ samba-3.0.0beta2/source/passdb/privileges.c 2003-07-02 23:19:02.000000000 -0500 -@@ -62,7 +62,7 @@ - /* initialise the privilege database */ - BOOL privilege_init(void) - { -- tdb = tdb_open_log(lock_path("privilege.tdb"), 0, TDB_DEFAULT, -+ tdb = tdb_open_log(state_path("privilege.tdb"), 0, TDB_DEFAULT, - O_RDWR|O_CREAT, 0600); - if (!tdb) { - DEBUG(0,("Failed to open privilege database\n")); diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c --- samba-3.0.0beta2.orig/source/passdb/secrets.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/passdb/secrets.c 2003-07-02 23:19:02.000000000 -0500 @@ -512,8 +500,8 @@ diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/s BOOL tdb_is_new = False; /* use the old database if present */ -- tdbfile = strdup(lock_path("winbindd_idmap.tdb")); -+ tdbfile = strdup(state_path("winbindd_idmap.tdb")); +- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb")); ++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb")); if (!tdbfile) { DEBUG(0, ("idmap_init: out of memory!\n")); return NT_STATUS_NO_MEMORY; -- cgit