diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-09-29 11:49:50 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-02 15:33:48 +0200 |
| commit | 44df2488e30da783add33b4fb85d96ce65856484 (patch) | |
| tree | 3750f027eb89377d3908e802869cfca5922b237c /source4/libcli | |
| parent | f390daef475126b4ff5a3d0ffd2babbd87d4c22b (diff) | |
| download | samba-44df2488e30da783add33b4fb85d96ce65856484.tar.gz samba-44df2488e30da783add33b4fb85d96ce65856484.tar.bz2 samba-44df2488e30da783add33b4fb85d96ce65856484.zip | |
s4: fix various warnings (not "const" related ones)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/ldap/ldap_client.c | 1 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_controls.c | 4 | ||||
| -rw-r--r-- | source4/libcli/security/object_tree.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index d278f407dc..3c78a7c7e2 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -403,7 +403,6 @@ static void ldap_connect_got_sock(struct composite_context *ctx, talloc_steal(conn, conn->sock); if (conn->ldaps) { struct socket_context *tls_socket; - struct socket_context *tmp_socket; char *cafile = lp_tls_cafile(conn->sock, conn->lp_ctx); if (!cafile || !*cafile) { diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c index aef775fab5..86493c81da 100644 --- a/source4/libcli/ldap/ldap_controls.c +++ b/source4/libcli/ldap/ldap_controls.c @@ -214,7 +214,7 @@ static bool decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void *_out) return false; } - if (!asn1_read_Integer(data, &(lsdfc->secinfo_flags))) { + if (!asn1_read_Integer(data, (int *) &(lsdfc->secinfo_flags))) { return false; } @@ -248,7 +248,7 @@ static bool decode_search_options_request(void *mem_ctx, DATA_BLOB in, void *_ou return false; } - if (!asn1_read_Integer(data, &(lsoc->search_options))) { + if (!asn1_read_Integer(data, (int *) &(lsoc->search_options))) { return false; } diff --git a/source4/libcli/security/object_tree.c b/source4/libcli/security/object_tree.c index 8a90019a59..85b407913c 100644 --- a/source4/libcli/security/object_tree.c +++ b/source4/libcli/security/object_tree.c @@ -94,13 +94,13 @@ struct object_tree * get_object_tree_by_GUID(struct object_tree *root, /* Change the granted access per each ACE */ void object_tree_modify_access(struct object_tree *root, - uint32_t access) + uint32_t access_mask) { struct object_tree *p; if (root){ - root->remaining_access &= ~access; + root->remaining_access &= ~access_mask; } for (p = root->children; p != NULL; p = p->next) - object_tree_modify_access(p, access); + object_tree_modify_access(p, access_mask); } |