The branch, master has been updated
via beb6c13 winbind: Fix an incompatible pointer type warning
via c03d5c5 dbwrap: Prevent transactions on non-persistent dbs
via dc2e475 torture: We use transactions for CLEAR_IF_FIRST db
from 554ba5e ldb: Add more data test data for one level test cases
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit beb6c13e9a8c317bca240e875d9e3bcd940a02fb
Author: Volker Lendecke <[email protected]>
Date: Mon Feb 4 15:52:49 2013 +0100
winbind: Fix an incompatible pointer type warning
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Fri Feb 8 15:27:51 CET 2013 on sn-devel-104
commit c03d5c5740f9d1894a971110029e8f567d300d8a
Author: Volker Lendecke <[email protected]>
Date: Fri Jan 11 15:32:39 2013 +0100
dbwrap: Prevent transactions on non-persistent dbs
dbwrap_ctdb does not allow this anyway. This patch will avoid suprises
when going non-clustered to clustered. Not everybody is developing
against a clustered environment :-)
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit dc2e47508d7075cf6507e0dea03da6999ef9097e
Author: Volker Lendecke <[email protected]>
Date: Fri Jan 11 17:29:01 2013 +0100
torture: We use transactions for CLEAR_IF_FIRST db
This does not work in the ctdb case
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/dbwrap/dbwrap.c | 5 +++++
source3/torture/test_idmap_tdb_common.c | 2 +-
source3/winbindd/wb_getgrsid.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
index 15eb239..f0b7a9a 100644
--- a/lib/dbwrap/dbwrap.c
+++ b/lib/dbwrap/dbwrap.c
@@ -452,6 +452,11 @@ int dbwrap_get_seqnum(struct db_context *db)
int dbwrap_transaction_start(struct db_context *db)
{
+ if (!db->persistent) {
+ DEBUG(1, ("transactions not supported on non-persistent "
+ "database %s\n", db->name));
+ return -1;
+ }
return db->transaction_start(db);
}
diff --git a/source3/torture/test_idmap_tdb_common.c
b/source3/torture/test_idmap_tdb_common.c
index d081660..5681eef 100644
--- a/source3/torture/test_idmap_tdb_common.c
+++ b/source3/torture/test_idmap_tdb_common.c
@@ -89,7 +89,7 @@ static bool open_db(struct idmap_tdb_common_context *ctx)
return false;
}
- ctx->db = db_open(ctx, db_path, 0, TDB_DEFAULT | TDB_CLEAR_IF_FIRST,
+ ctx->db = db_open(ctx, db_path, 0, TDB_DEFAULT,
O_RDWR | O_CREAT, 0600,
DBWRAP_LOCK_ORDER_1);
diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c
index fa376da..f3899b0 100644
--- a/source3/winbindd/wb_getgrsid.c
+++ b/source3/winbindd/wb_getgrsid.c
@@ -143,7 +143,7 @@ static void wb_getgrsid_sid2gid_done(struct tevent_req
*subreq)
* mapped to ID_TYPE_BOTH:
* create a group with the sid/xid as only member
*/
- char *name;
+ const char *name;
if (xid.type != ID_TYPE_BOTH) {
tevent_req_nterror(req, NT_STATUS_NO_SUCH_GROUP);
--
Samba Shared Repository
