summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-02-27 09:29:36 +0100
committerAndrew Bartlett <abartlet@samba.org>2014-04-02 09:03:44 +0200
commitde773f3785d8fedba605437fbd434a49b9d18b0e (patch)
tree18764cd912074f57b7e83747c9c8c7539c587780
parent7377aa11f733f2f6d1302f183cc39cf233739769 (diff)
downloadsamba-de773f3785d8fedba605437fbd434a49b9d18b0e.tar.gz
samba-de773f3785d8fedba605437fbd434a49b9d18b0e.tar.xz
samba-de773f3785d8fedba605437fbd434a49b9d18b0e.zip
s4:dsdb/ldb_modules: avoid declaration after code warnings
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/dsdb/samdb/ldb_modules/dirsync.c5
-rw-r--r--source4/dsdb/samdb/ldb_modules/operational.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c
index 69bb5a2011..c93189ef71 100644
--- a/source4/dsdb/samdb/ldb_modules/dirsync.c
+++ b/source4/dsdb/samdb/ldb_modules/dirsync.c
@@ -336,10 +336,13 @@ skip:
* if not we remove the attribute.
*/
for (i = msg->num_elements - 1; i >= 0; i--) {
+ const char *ldapattrname;
+
el = &(msg->elements[i]);
+ ldapattrname = el->name;
+
attr = dsdb_attribute_by_lDAPDisplayName(dsc->schema,
el->name);
- const char *ldapattrname = el->name;
keep = false;
if (attr->linkID & 1) {
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 9337faacc4..2ebefac171 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -131,7 +131,7 @@ static int construct_token_groups(struct ldb_module *module,
struct ldb_message *msg, enum ldb_scope scope,
struct ldb_request *parent)
{
- struct ldb_context *ldb = ldb_module_get_ctx(module);;
+ struct ldb_context *ldb = ldb_module_get_ctx(module);
TALLOC_CTX *tmp_ctx = talloc_new(msg);
unsigned int i;
int ret;