The branch, master has been updated
via 13d667b s3: Implement db_id for dbwrap_cache
via d260283 s3: Initialize "stored_callback" in dbwrap_cache
via 13774a5 s3: Remove two unused variables
from c0ba829 s3:smbcontrol: remove an unused variable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 13d667bbffa1bb7af7bdb1031a90883beba9ddad
Author: Volker Lendecke <[email protected]>
Date: Sat Apr 21 12:07:28 2012 +0200
s3: Implement db_id for dbwrap_cache
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Sat Apr 21 13:46:00 CEST 2012 on sn-devel-104
commit d26028316d69f2346cfa7f39c9678d94a58b4535
Author: Volker Lendecke <[email protected]>
Date: Sat Apr 21 12:04:13 2012 +0200
s3: Initialize "stored_callback" in dbwrap_cache
This should fix one of the recent flaky tests
commit 13774a5f9f902ba3cc02ddc3a90f64ab8e80b514
Author: Volker Lendecke <[email protected]>
Date: Sat Apr 21 10:24:42 2012 +0200
s3: Remove two unused variables
-----------------------------------------------------------------------
Summary of changes:
source3/lib/dbwrap/dbwrap_cache.c | 10 ++++++++++
source3/passdb/lookup_sid.c | 2 --
2 files changed, 10 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap/dbwrap_cache.c
b/source3/lib/dbwrap/dbwrap_cache.c
index e0fced5..2824946 100644
--- a/source3/lib/dbwrap/dbwrap_cache.c
+++ b/source3/lib/dbwrap/dbwrap_cache.c
@@ -173,6 +173,14 @@ static int dbwrap_cache_exists(struct db_context *db,
TDB_DATA key)
return dbwrap_exists(ctx->backing, key);
}
+static void dbwrap_cache_id(struct db_context *db, const uint8_t **id,
+ size_t *idlen)
+{
+ struct db_cache_ctx *ctx = talloc_get_type_abort(
+ db->private_data, struct db_cache_ctx);
+ return dbwrap_db_id(ctx->backing, id, idlen);
+}
+
struct db_context *db_open_cache(TALLOC_CTX *mem_ctx,
struct db_context *backing)
{
@@ -208,6 +216,8 @@ struct db_context *db_open_cache(TALLOC_CTX *mem_ctx,
db->transaction_cancel = dbwrap_cache_transaction_cancel;
db->parse_record = dbwrap_cache_parse_record;
db->exists = dbwrap_cache_exists;
+ db->id = dbwrap_cache_id;
+ db->stored_callback = NULL;
db->wipe = NULL;
db->lock_order = 0;
db->persistent = false;
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index f544a3f..3f7be2a 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1385,7 +1385,6 @@ bool sid_to_uid(const struct dom_sid *psid, uid_t *puid)
bool expired = true;
bool ret;
uint32 rid;
- gid_t gid;
/* Optimize for the Unix Users Domain
* as the conversion is straightforward */
@@ -1439,7 +1438,6 @@ bool sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
bool expired = true;
bool ret;
uint32 rid;
- uid_t uid;
/* Optimize for the Unix Groups Domain
* as the conversion is straightforward */
--
Samba Shared Repository
