The branch, master has been updated
via 8745c70 s3:winbind: put winbindd_cache into the state dir, not the
cache dir
via 350d8e5 s3:dbwrap_ctdb: improve error message in transaction
destructor
via 9c02524 s3: let g_lock_unlock() return more specific status codes
on failure
from 14876e6 s3: Fix Coverity ID 2611, UNINIT
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8745c70dfab058d609bc0ec88561ac62e1317e50
Author: Michael Adam <[email protected]>
Date: Wed Sep 7 17:38:42 2011 +0200
s3:winbind: put winbindd_cache into the state dir, not the cache dir
Despite the name, in winbind offline logon mode, this is a database
that contains valuable information and should not be cleared.
Autobuild-User: Michael Adam <[email protected]>
Autobuild-Date: Wed Sep 7 21:17:37 CEST 2011 on sn-devel-104
commit 350d8e56db2dcc7030dc573f56d5d4a32510b757
Author: Gregor Beck <[email protected]>
Date: Mon Sep 5 17:07:37 2011 +0200
s3:dbwrap_ctdb: improve error message in transaction destructor
Signed-off-by: Michael Adam <[email protected]>
commit 9c0252446fe97c037c9af9b8b0bea5f5b86d45e8
Author: Gregor Beck <[email protected]>
Date: Wed Aug 31 10:19:18 2011 +0200
s3: let g_lock_unlock() return more specific status codes on failure
Signed-off-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/dbwrap/dbwrap_ctdb.c | 3 ++-
source3/lib/g_lock.c | 4 ++--
source3/winbindd/winbindd_cache.c | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 3233253..429f542 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -329,7 +329,8 @@ static int db_ctdb_transaction_destructor(struct
db_ctdb_transaction_handle *h)
status = g_lock_unlock(h->ctx->lock_ctx, h->lock_name);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("g_lock_unlock failed: %s\n", nt_errstr(status)));
+ DEBUG(0, ("g_lock_unlock failed for %s: %s\n", h->lock_name,
+ nt_errstr(status)));
return -1;
}
return 0;
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index bed3ec1..308e5cf 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -523,7 +523,7 @@ static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx,
const char *name,
if (!g_lock_parse(talloc_tos(), rec->value, &num_locks, &locks)) {
DEBUG(10, ("g_lock_parse for %s failed\n", name));
- status = NT_STATUS_INTERNAL_ERROR;
+ status = NT_STATUS_FILE_INVALID;
goto done;
}
@@ -535,7 +535,7 @@ static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx,
const char *name,
if (i == num_locks) {
DEBUG(10, ("g_lock_force_unlock: Lock not found\n"));
- status = NT_STATUS_INTERNAL_ERROR;
+ status = NT_STATUS_NOT_FOUND;
goto done;
}
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index ec5f9e7..323c0b9 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -3106,7 +3106,7 @@ bool init_wcache(void)
return true;
/* when working offline we must not clear the cache on restart */
- wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
+ wcache->tdb = tdb_open_log(state_path("winbindd_cache.tdb"),
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_INCOMPATIBLE_HASH |
(lp_winbind_offline_logon() ?
TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST)),
--
Samba Shared Repository
