r26645: Janitorial: Fix a couple of warnings.

diff --git a/source/cluster/ctdb/brlock_ctdb.c b/source/cluster/ctdb/brlock_ctdb.c
index c38d666c3c60f7e1cf039a506faf6ba0b724b38f..1b22c6c72701b22ddba37b57b4ef99c76bc2a55a 100644 (file)
--- a/source/cluster/ctdb/brlock_ctdb.c
+++ b/source/cluster/ctdb/brlock_ctdb.c
@@ -102,7 +102,7 @@ static void show_locks(const char *op, struct lock_struct *locks, int count)
   talloc_free(). We need the messaging_ctx to allow for
   pending lock notifications.
 */
-static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server, 
+static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server, struct loadparm_context *lp_ctx,
                                    struct messaging_context *messaging_ctx)
 {
        struct ctdb_context *ctdb = talloc_get_type(cluster_backend_handle(), 

diff --git a/source/torture/libnet/libnet_lookup.c b/source/torture/libnet/libnet_lookup.c
index bf3c77fb44b47f1091ff9edc3a2b81e39cce6881..9167d1de3ec0005f97ebf2cf7c0cafd757091778 100644 (file)
--- a/source/torture/libnet/libnet_lookup.c
+++ b/source/torture/libnet/libnet_lookup.c
@@ -36,7 +36,7 @@ bool torture_lookup(struct torture_context *torture)
        TALLOC_CTX *mem_ctx;
        struct libnet_context *ctx;
        struct libnet_Lookup lookup;
-       struct dcerpc_binding *bind;
+       struct dcerpc_binding *binding;
 
        mem_ctx = talloc_init("test_lookup");
 
@@ -45,9 +45,9 @@ bool torture_lookup(struct torture_context *torture)
 
        lookup.in.hostname = torture_setting_string(torture, "host", NULL);
        if (lookup.in.hostname == NULL) {
-               status = torture_rpc_binding(torture, &bind);
+               status = torture_rpc_binding(torture, &binding);
                if (NT_STATUS_IS_OK(status)) {
-                       lookup.in.hostname = bind->host;
+                       lookup.in.hostname = binding->host;
                }
        }
 
@@ -80,7 +80,7 @@ bool torture_lookup_host(struct torture_context *torture)
        TALLOC_CTX *mem_ctx;
        struct libnet_context *ctx;
        struct libnet_Lookup lookup;
-       struct dcerpc_binding *bind;
+       struct dcerpc_binding *binding;
 
        mem_ctx = talloc_init("test_lookup_host");
 
@@ -89,9 +89,9 @@ bool torture_lookup_host(struct torture_context *torture)
 
        lookup.in.hostname = torture_setting_string(torture, "host", NULL);
        if (lookup.in.hostname == NULL) {
-               status = torture_rpc_binding(torture, &bind);
+               status = torture_rpc_binding(torture, &binding);
                if (NT_STATUS_IS_OK(status)) {
-                       lookup.in.hostname = bind->host;
+                       lookup.in.hostname = binding->host;
                }
        }
 

diff --git a/source/torture/libnet/libnet_share.c b/source/torture/libnet/libnet_share.c
index efd53cc0799e582f36e957d997fa9c074c45f44e..eb1edff18d48cf89f522907a4916599add6ca744 100644 (file)
--- a/source/torture/libnet/libnet_share.c
+++ b/source/torture/libnet/libnet_share.c
@@ -121,11 +121,11 @@ bool torture_listshares(struct torture_context *torture)
        int i;
        bool ret = true;
        struct libnet_context* libnetctx;
-       struct dcerpc_binding *bind;
+       struct dcerpc_binding *binding;
        TALLOC_CTX *mem_ctx;
 
        mem_ctx = talloc_init("test_listshares");
-       status = torture_rpc_binding(torture, &bind);
+       status = torture_rpc_binding(torture, &binding);
        if (!NT_STATUS_IS_OK(status)) {
                ret = false;
                goto done;
@@ -142,7 +142,7 @@ bool torture_listshares(struct torture_context *torture)
        
        printf("Testing libnet_ListShare\n");
        
-       share.in.server_name = talloc_asprintf(mem_ctx, "%s", bind->host);
+       share.in.server_name = talloc_asprintf(mem_ctx, "%s", binding->host);
 
        for (i = 0; i < ARRAY_SIZE(levels); i++) {
                share.in.level = levels[i];
@@ -199,7 +199,7 @@ static bool test_addshare(struct dcerpc_pipe *svc_pipe, TALLOC_CTX *mem_ctx, con
 bool torture_delshare(struct torture_context *torture)
 {
        struct dcerpc_pipe *p;
-       struct dcerpc_binding *bind;
+       struct dcerpc_binding *binding;
        struct libnet_context* libnetctx;
        const char *host;
        NTSTATUS  status;
@@ -207,7 +207,7 @@ bool torture_delshare(struct torture_context *torture)
        struct libnet_DelShare share;
        
        host = torture_setting_string(torture, "host", NULL);
-       status = torture_rpc_binding(torture, &bind);
+       status = torture_rpc_binding(torture, &binding);
        torture_assert_ntstatus_ok(torture, status, "Failed to get binding");
 
        libnetctx = libnet_context_init(NULL, torture->lp_ctx);
@@ -223,7 +223,7 @@ bool torture_delshare(struct torture_context *torture)
                return false;
        }
 
-       share.in.server_name    = bind->host;
+       share.in.server_name    = binding->host;
        share.in.share_name     = TEST_SHARENAME;
 
        status = libnet_DelShare(libnetctx, torture, &share);

diff --git a/source/torture/libnet/libnet_user.c b/source/torture/libnet/libnet_user.c
index ae87e6da87b036d8a5b510b391de5044e155e36e..6ea670629e92e216496eb16b2118dafd95b959d1 100644 (file)
--- a/source/torture/libnet/libnet_user.c
+++ b/source/torture/libnet/libnet_user.c
@@ -461,7 +461,7 @@ static void set_test_changes(TALLOC_CTX *mem_ctx, struct libnet_ModifyUser *r,
 bool torture_modifyuser(struct torture_context *torture)
 {
        NTSTATUS status;
-       struct dcerpc_binding *bind;
+       struct dcerpc_binding *binding;
        struct dcerpc_pipe *p;
        TALLOC_CTX *prep_mem_ctx;
        struct policy_handle h;
@@ -499,7 +499,7 @@ bool torture_modifyuser(struct torture_context *torture)
                goto done;
        }
 
-       status = torture_rpc_binding(torture, &bind);
+       status = torture_rpc_binding(torture, &binding);
        if (!NT_STATUS_IS_OK(status)) {
                ret = false;
                goto done;