The branch, master has been updated via d712356... s4:repl_meta_data LDB module - fix counter types via 8608eae... s4:net domainlevel tool - fix up the error handling as Jelmer suggested via 6d95a20... s4:dsdb_cache LDB module - fix a typo via da5cd4b... s4:samldb LDB module - remove unused variables from b5dc394... s4:gensec expose gensec_set_target_principal for use outside GENSEC
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d7123565698fefd16e7696c0e4bb4ec98f6f62ac Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Fri May 14 18:56:51 2010 +0200 s4:repl_meta_data LDB module - fix counter types commit 8608eaef76631666a41109317d2a9b20979c5025 Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Fri May 14 18:59:36 2010 +0200 s4:net domainlevel tool - fix up the error handling as Jelmer suggested Sorry, I've copied this from the "ldap.py" test and thought it would work. commit 6d95a204d7115a10608759eaabcbfbe495ed2802 Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Fri May 14 14:13:20 2010 +0200 s4:dsdb_cache LDB module - fix a typo commit da5cd4ba34bfa53d887e80fd2348df5ee6b23c5f Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Tue May 11 17:25:24 2010 +0200 s4:samldb LDB module - remove unused variables ----------------------------------------------------------------------- Summary of changes: source4/dsdb/samdb/ldb_modules/dsdb_cache.c | 2 +- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +- source4/dsdb/samdb/ldb_modules/samldb.c | 2 -- .../scripting/python/samba/netcmd/domainlevel.py | 6 ++++-- 4 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/dsdb_cache.c b/source4/dsdb/samdb/ldb_modules/dsdb_cache.c index e60605d..b7e4fca 100644 --- a/source4/dsdb/samdb/ldb_modules/dsdb_cache.c +++ b/source4/dsdb/samdb/ldb_modules/dsdb_cache.c @@ -2,7 +2,7 @@ Unix SMB/CIFS mplementation. The Module that loads some DSDB related things - into memory. E.g. it loads the dsdb_schema struture + into memory. E.g. it loads the dsdb_schema structure Copyright (C) Stefan Metzmacher 2007 diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 374467c..a6aeb5e 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -122,7 +122,7 @@ static const char *urgent_attrs[] = { static bool replmd_check_urgent_objectclass(const struct ldb_message_element *objectclass_el, enum urgent_situation situation) { - int i, j; + unsigned int i, j; for (i=0; urgent_objects[i].update_name; i++) { if ((situation & urgent_objects[i].repl_situation) == 0) { diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 05d153a..4a50a3f 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -1474,8 +1474,6 @@ static int samldb_member_check(struct samldb_ctx *ac) struct ldb_dn *member_dn, *group_dn; uint32_t prim_group_rid; struct dom_sid *sid; - const char * const * no_attrs = { NULL }; - struct ldb_message **res; unsigned int i; ldb = ldb_module_get_ctx(ac->module); diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py index 72559bb..4278ae5 100644 --- a/source4/scripting/python/samba/netcmd/domainlevel.py +++ b/source4/scripting/python/samba/netcmd/domainlevel.py @@ -200,7 +200,8 @@ class cmd_domainlevel(Command): try: samdb.modify(m) except LdbError, (num, _): - self.assertEquals(num, ldb.ERR_UNWILLING_TO_PERFORM) + if num != ldb.ERR_UNWILLING_TO_PERFORM: + raise # Directly on the base DN m = ldb.Message() @@ -219,7 +220,8 @@ class cmd_domainlevel(Command): try: samdb.modify(m) except LdbError, (num, _): - self.assertEquals(num, ldb.ERR_UNWILLING_TO_PERFORM) + if num != ldb.ERR_UNWILLING_TO_PERFORM: + raise level_domain = new_level_domain msgs.append("Domain function level changed!") -- Samba Shared Repository