[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  7e8b042... s4:ldb Fix declaration in the middle of the code
      from  4cc0bb7... s4: Fix the build

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7e8b042b07f374fae9f57feb7f16c3bcd5abf20c
Author: Simo Sorce <i...@samba.org>
Date:   Wed Dec 23 10:33:26 2009 -0500

    s4:ldb Fix declaration in the middle of the code

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/tools/ldbdel.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 4180afb..4238f35 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -84,9 +84,10 @@ static void usage(void)
 
 int main(int argc, const char **argv)
 {
+       struct ldb_control **req_ctrls;
+       struct ldb_cmdline *options;
        struct ldb_context *ldb;
        int ret = 0, i;
-       struct ldb_cmdline *options;
 
        ldb = ldb_init(NULL, NULL);
 
@@ -96,7 +97,8 @@ int main(int argc, const char **argv)
                usage();
                exit(1);
        }
-        struct ldb_control **req_ctrls = ldb_parse_control_strings(ldb, ldb, 
(const char **)options->controls);
+
+       req_ctrls = ldb_parse_control_strings(ldb, ldb, (const char 
**)options->controls);
        if (options->controls != NULL &&  req_ctrls== NULL) {
                printf("parsing controls failed: %s\n", ldb_errstring(ldb));
                return -1;


-- 
Samba Shared Repository