r25000: Fix some more C++ compatibility warnings.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 7 Sep 2007 15:08:14 +0000 (15:08 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 20:05:27 +0000 (15:05 -0500)
(This used to be commit 08bb1ef643ab906f1645cf6f32763dc73b1884e4)

72 files changed:
source4/auth/auth.c
source4/auth/gensec/gensec_krb5.c
source4/auth/gensec/schannel.c
source4/auth/gensec/spnego.c
source4/auth/ntlmssp/ntlmssp.c
source4/auth/ntlmssp/ntlmssp_client.c
source4/auth/ntlmssp/ntlmssp_server.c
source4/auth/ntlmssp/ntlmssp_sign.c
source4/cluster/ctdb/client/ctdb_client.c
source4/cluster/ctdb/common/ctdb_io.c
source4/cluster/ctdb/common/ctdb_util.c
source4/cluster/ctdb/ctdb_cluster.c
source4/dsdb/samdb/ldb_modules/entryUUID.c
source4/dsdb/samdb/ldb_modules/kludge_acl.c
source4/dsdb/samdb/ldb_modules/partition.c
source4/dsdb/samdb/samdb.c
source4/dsdb/schema/schema_constructed.c
source4/kdc/kpasswdd.c
source4/lib/ldb/ldb_tdb/ldb_cache.c
source4/lib/ldb/ldb_tdb/ldb_index.c
source4/lib/ldb/ldb_tdb/ldb_search.c
source4/lib/messaging/messaging.c
source4/lib/registry/local.c
source4/lib/registry/patchfile_preg.c
source4/lib/registry/regf.c
source4/lib/registry/tools/regshell.c
source4/lib/util/fault.c
source4/lib/util/time.c
source4/libcli/ldap/ldap.c
source4/libcli/nbt/nbtsocket.c
source4/libcli/resolve/resolve.c
source4/libcli/security/dom_sid.c
source4/libcli/smb2/request.c
source4/libcli/util/asn1.c
source4/librpc/ndr/libndr.h
source4/librpc/ndr/ndr.c
source4/librpc/ndr/ndr_string.c
source4/librpc/rpc/dcerpc.c
source4/librpc/rpc/dcerpc_sock.c
source4/scripting/ejs/smbcalls_cli.c
source4/scripting/ejs/smbcalls_rpc.c
source4/torture/basic/aliases.c
source4/torture/basic/attr.c
source4/torture/basic/base.c
source4/torture/basic/denytest.c
source4/torture/basic/dir.c
source4/torture/basic/disconnect.c
source4/torture/basic/locking.c
source4/torture/basic/mangle_test.c
source4/torture/basic/properties.c
source4/torture/basic/rename.c
source4/torture/basic/unlink.c
source4/torture/nbench/nbio.c
source4/torture/nbt/dgram.c
source4/torture/nbt/winsreplication.c
source4/torture/raw/chkpath.c
source4/torture/raw/close.c
source4/torture/raw/composite.c
source4/torture/raw/context.c
source4/torture/raw/eas.c
source4/torture/raw/ioctl.c
source4/torture/raw/mkdir.c
source4/torture/raw/notify.c
source4/torture/raw/oplock.c
source4/torture/raw/read.c
source4/torture/raw/samba3hide.c
source4/torture/raw/samba3misc.c
source4/torture/raw/search.c
source4/torture/raw/streams.c
source4/torture/raw/unlink.c
source4/torture/raw/write.c
source4/utils/ntlm_auth.c

index 57e2c050c12c639b21fd187557f176f6c9c0a42a..b74bbc33714acb62f71fd27451f8fb648ac91d05 100644 (file)
@@ -443,9 +443,8 @@ static int num_backends;
   The 'name' can be later used by other backends to find the operations
   structure for this backend.
 */
-NTSTATUS auth_register(const void *_ops)
+NTSTATUS auth_register(const struct auth_operations *ops)
 {
-       const struct auth_operations *ops = _ops;
        struct auth_operations *new_ops;
        
        if (auth_backend_byname(ops->name) != NULL) {
index a64da5128f2c8a1e726a7d87d8aa14f0c8f47fc2..811e562353e03274806b165ed6b9cad63e5d26d6 100644 (file)
@@ -500,7 +500,7 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
 static NTSTATUS gensec_krb5_session_key(struct gensec_security *gensec_security, 
                                        DATA_BLOB *session_key) 
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        krb5_auth_context auth_context = gensec_krb5_state->auth_context;
        krb5_keyblock *skey;
@@ -539,7 +539,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
                                         struct auth_session_info **_session_info) 
 {
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        struct auth_serversupplied_info *server_info = NULL;
        struct auth_session_info *session_info = NULL;
@@ -666,7 +666,7 @@ static NTSTATUS gensec_krb5_wrap(struct gensec_security *gensec_security,
                                   const DATA_BLOB *in, 
                                   DATA_BLOB *out)
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        krb5_auth_context auth_context = gensec_krb5_state->auth_context;
        krb5_error_code ret;
@@ -696,7 +696,7 @@ static NTSTATUS gensec_krb5_unwrap(struct gensec_security *gensec_security,
                                     const DATA_BLOB *in, 
                                     DATA_BLOB *out)
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        krb5_auth_context auth_context = gensec_krb5_state->auth_context;
        krb5_error_code ret;
@@ -725,7 +725,7 @@ static NTSTATUS gensec_krb5_unwrap(struct gensec_security *gensec_security,
 static BOOL gensec_krb5_have_feature(struct gensec_security *gensec_security,
                                     uint32_t feature)
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        if (feature & GENSEC_FEATURE_SESSION_KEY) {
                return True;
        } 
index 5dc5c287eca1db092af0d958ac4339a0e45edf71..6882eab945b50c14f93d70c4ec73c9a0bc4ec58f 100644 (file)
@@ -44,7 +44,7 @@ static NTSTATUS schannel_session_key(struct gensec_security *gensec_security,
 static NTSTATUS schannel_update(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, 
                                       const DATA_BLOB in, DATA_BLOB *out) 
 {
-       struct schannel_state *state = gensec_security->private_data;
+       struct schannel_state *state = (struct schannel_state *)gensec_security->private_data;
        NTSTATUS status;
        struct schannel_bind bind_schannel;
        struct schannel_bind_ack bind_schannel_ack;
@@ -207,7 +207,7 @@ static NTSTATUS schannel_server_start(struct gensec_security *gensec_security)
                return status;
        }
 
-       state = gensec_security->private_data;
+       state = (struct schannel_state *)gensec_security->private_data;
        state->initiator = False;
                
        return NT_STATUS_OK;
@@ -223,7 +223,7 @@ static NTSTATUS schannel_client_start(struct gensec_security *gensec_security)
                return status;
        }
 
-       state = gensec_security->private_data;
+       state = (struct schannel_state *)gensec_security->private_data;
        state->initiator = True;
                
        return NT_STATUS_OK;
index 88521b912cbc9b86fba9f9d17503e629bcd88b96..009d95a3d24877c483ce4f88b871f41e1272ef6a 100644 (file)
@@ -92,7 +92,7 @@ static NTSTATUS gensec_spnego_unseal_packet(struct gensec_security *gensec_secur
                                            const uint8_t *whole_pdu, size_t pdu_length, 
                                            const DATA_BLOB *sig)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -112,7 +112,7 @@ static NTSTATUS gensec_spnego_check_packet(struct gensec_security *gensec_securi
                                           const uint8_t *whole_pdu, size_t pdu_length, 
                                           const DATA_BLOB *sig)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -132,7 +132,7 @@ static NTSTATUS gensec_spnego_seal_packet(struct gensec_security *gensec_securit
                                          const uint8_t *whole_pdu, size_t pdu_length, 
                                          DATA_BLOB *sig)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -152,7 +152,7 @@ static NTSTATUS gensec_spnego_sign_packet(struct gensec_security *gensec_securit
                                          const uint8_t *whole_pdu, size_t pdu_length, 
                                          DATA_BLOB *sig)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -171,7 +171,7 @@ static NTSTATUS gensec_spnego_wrap(struct gensec_security *gensec_security,
                                   const DATA_BLOB *in, 
                                   DATA_BLOB *out)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -188,7 +188,7 @@ static NTSTATUS gensec_spnego_unwrap(struct gensec_security *gensec_security,
                                     const DATA_BLOB *in, 
                                     DATA_BLOB *out)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -206,7 +206,7 @@ static NTSTATUS gensec_spnego_wrap_packets(struct gensec_security *gensec_securi
                                           DATA_BLOB *out,
                                           size_t *len_processed) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -222,7 +222,7 @@ static NTSTATUS gensec_spnego_wrap_packets(struct gensec_security *gensec_securi
 static NTSTATUS gensec_spnego_packet_full_request(struct gensec_security *gensec_security, 
                                                DATA_BLOB blob, size_t *size)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -240,7 +240,7 @@ static NTSTATUS gensec_spnego_unwrap_packets(struct gensec_security *gensec_secu
                                             DATA_BLOB *out,
                                             size_t *len_processed) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -255,7 +255,7 @@ static NTSTATUS gensec_spnego_unwrap_packets(struct gensec_security *gensec_secu
 
 static size_t gensec_spnego_sig_size(struct gensec_security *gensec_security, size_t data_size) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -267,7 +267,7 @@ static size_t gensec_spnego_sig_size(struct gensec_security *gensec_security, si
 
 static size_t gensec_spnego_max_input_size(struct gensec_security *gensec_security) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -279,7 +279,7 @@ static size_t gensec_spnego_max_input_size(struct gensec_security *gensec_securi
 
 static size_t gensec_spnego_max_wrapped_size(struct gensec_security *gensec_security) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
 
        if (spnego_state->state_position != SPNEGO_DONE 
            && spnego_state->state_position != SPNEGO_FALLBACK) {
@@ -292,7 +292,7 @@ static size_t gensec_spnego_max_wrapped_size(struct gensec_security *gensec_secu
 static NTSTATUS gensec_spnego_session_key(struct gensec_security *gensec_security, 
                                          DATA_BLOB *session_key)
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
        if (!spnego_state->sub_sec_security) {
                return NT_STATUS_INVALID_PARAMETER;
        }
@@ -304,7 +304,7 @@ static NTSTATUS gensec_spnego_session_key(struct gensec_security *gensec_securit
 static NTSTATUS gensec_spnego_session_info(struct gensec_security *gensec_security,
                                                                      struct auth_session_info **session_info) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
        if (!spnego_state->sub_sec_security) {
                return NT_STATUS_INVALID_PARAMETER;
        }
@@ -685,7 +685,7 @@ static NTSTATUS gensec_spnego_server_negTokenTarg(struct gensec_security *gensec
 static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, 
                                     const DATA_BLOB in, DATA_BLOB *out) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
        DATA_BLOB null_data_blob = data_blob(NULL, 0);
        DATA_BLOB unwrapped_out = data_blob(NULL, 0);
        struct spnego_data spnego_out;
@@ -1002,7 +1002,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
 static BOOL gensec_spnego_have_feature(struct gensec_security *gensec_security,
                                       uint32_t feature) 
 {
-       struct spnego_state *spnego_state = gensec_security->private_data;
+       struct spnego_state *spnego_state = (struct spnego_state *)gensec_security->private_data;
        if (!spnego_state->sub_sec_security) {
                return False;
        }
index a2d2d2217088fd50c6a7d5d6b4f368996252aff2..77860c41c54b88b9f09212df0d7f814778c2fda3 100644 (file)
@@ -199,7 +199,7 @@ static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
                                      TALLOC_CTX *out_mem_ctx, 
                                      const DATA_BLOB input, DATA_BLOB *out)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        NTSTATUS status;
        uint32_t i;
 
@@ -229,7 +229,7 @@ static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
 NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security, 
                                    DATA_BLOB *session_key)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        if (!gensec_ntlmssp_state->session_key.data) {
                return NT_STATUS_NO_USER_SESSION_KEY;
@@ -344,7 +344,7 @@ DATA_BLOB ntlmssp_weakend_key(struct gensec_ntlmssp_state *gensec_ntlmssp_state,
 static BOOL gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
                                        uint32_t feature)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        if (feature & GENSEC_FEATURE_SIGN) {
                if (!gensec_ntlmssp_state->session_key.length) {
                        return False;
index 3f507908f25deaa8959bbb1e3b9887ce244d65fb..003394a21b05e1bba1e793a99201f43e8431468f 100644 (file)
@@ -47,7 +47,7 @@ NTSTATUS ntlmssp_client_initial(struct gensec_security *gensec_security,
                                TALLOC_CTX *out_mem_ctx, 
                                DATA_BLOB in, DATA_BLOB *out) 
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        if (gensec_ntlmssp_state->unicode) {
                gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
@@ -87,7 +87,7 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
                                  TALLOC_CTX *out_mem_ctx,
                                  const DATA_BLOB in, DATA_BLOB *out) 
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        uint32_t chal_flags, ntlmssp_command, unkn1, unkn2;
        DATA_BLOB server_domain_blob;
        DATA_BLOB challenge_blob;
@@ -292,7 +292,7 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security)
        nt_status = gensec_ntlmssp_start(gensec_security);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
-       gensec_ntlmssp_state = gensec_security->private_data;
+       gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        gensec_ntlmssp_state->role = NTLMSSP_CLIENT;
 
index 18e38cf6bfd1eb7b954e2a3c6feaf67e4aa4faf4..e29334e18376569c906956edd0ff99b0f39402a9 100644 (file)
@@ -174,7 +174,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security,
                                  TALLOC_CTX *out_mem_ctx, 
                                  const DATA_BLOB in, DATA_BLOB *out) 
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        DATA_BLOB struct_blob;
        fstring dnsname, dnsdomname;
        uint32_t neg_flags = 0;
@@ -447,7 +447,7 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security,
                                        DATA_BLOB *user_session_key, 
                                        DATA_BLOB *lm_session_key) 
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        NTSTATUS nt_status;
        DATA_BLOB session_key = data_blob(NULL, 0);
 
@@ -594,7 +594,7 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security,
                             TALLOC_CTX *out_mem_ctx, 
                             const DATA_BLOB in, DATA_BLOB *out) 
 {      
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        DATA_BLOB user_session_key = data_blob(NULL, 0);
        DATA_BLOB lm_session_key = data_blob(NULL, 0);
        NTSTATUS nt_status;
@@ -760,7 +760,7 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security,
                                     struct auth_session_info **session_info) 
 {
        NTSTATUS nt_status;
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        nt_status = auth_generate_session_info(gensec_ntlmssp_state, gensec_ntlmssp_state->server_info, session_info);
        NT_STATUS_NOT_OK_RETURN(nt_status);
@@ -784,7 +784,7 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
        nt_status = gensec_ntlmssp_start(gensec_security);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
-       gensec_ntlmssp_state = gensec_security->private_data;
+       gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        gensec_ntlmssp_state->role = NTLMSSP_SERVER;
 
index 4eb6156debfe606c1b7cd67c1a0a69bbe665c467..892960cf5658b9d7cc223f2cbaec234815400568 100644 (file)
@@ -137,7 +137,7 @@ _PUBLIC_ NTSTATUS gensec_ntlmssp_sign_packet(struct gensec_security *gensec_secu
                                    const uint8_t *whole_pdu, size_t pdu_length, 
                                    DATA_BLOB *sig)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        return ntlmssp_make_packet_signature(gensec_ntlmssp_state, sig_mem_ctx, 
                                             data, length, 
@@ -156,7 +156,7 @@ NTSTATUS gensec_ntlmssp_check_packet(struct gensec_security *gensec_security,
                                     const uint8_t *whole_pdu, size_t pdu_length, 
                                     const DATA_BLOB *sig)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
 
        DATA_BLOB local_sig;
        NTSTATUS nt_status;
@@ -220,7 +220,7 @@ NTSTATUS gensec_ntlmssp_seal_packet(struct gensec_security *gensec_security,
                                    const uint8_t *whole_pdu, size_t pdu_length, 
                                    DATA_BLOB *sig)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        NTSTATUS nt_status;
        if (!gensec_ntlmssp_state->session_key.length) {
                DEBUG(3, ("NO session key, cannot seal packet\n"));
@@ -281,7 +281,7 @@ NTSTATUS gensec_ntlmssp_unseal_packet(struct gensec_security *gensec_security,
                                      const uint8_t *whole_pdu, size_t pdu_length, 
                                      const DATA_BLOB *sig)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
+       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        if (!gensec_ntlmssp_state->session_key.length) {
                DEBUG(3, ("NO session key, cannot unseal packet\n"));
                return NT_STATUS_NO_USER_SESSION_KEY;
index b569a69c8d8d3bcce5f241288140751a52b4ce3d..626ecf01c749a14b2bb2c86d22b930fb105fe9dc 100644 (file)
@@ -1970,7 +1970,7 @@ int ctdb_ctrl_set_tunable(struct ctdb_context *ctdb,
        int ret;
 
        data.dsize = offsetof(struct ctdb_control_set_tunable, name) + strlen(name) + 1;
-       data.dptr  = talloc_size(ctdb, data.dsize);
+       data.dptr  = talloc_array(ctdb, unsigned char, data.dsize);
        CTDB_NO_MEMORY(ctdb, data.dptr);
 
        t = (struct ctdb_control_set_tunable *)data.dptr;
index 3cc522b58a485ea3791a3d59597a7852cc049816..5c418e495639e96b708985ddbdd21c4ea5057c3a 100644 (file)
@@ -73,8 +73,9 @@ static void queue_io_read(struct ctdb_queue *queue)
        }
 
 
-       queue->partial.data = talloc_realloc_size(queue, queue->partial.data, 
-                                                 num_ready + queue->partial.length);
+       queue->partial.data = talloc_realloc(queue, queue->partial.data, 
+                                            uint8_t, 
+                                            num_ready + queue->partial.length);
 
        if (queue->partial.data == NULL) {
                DEBUG(0,("read error alloc failed for %u\n", 
index 54b1e4e7ff5f68887b7f1c169533401b253cf651..f11388331d33529ec3cc0db96859b51d17cee3dd 100644 (file)
@@ -51,7 +51,7 @@ void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...)
 /*
   a fatal internal error occurred - no hope for recovery
 */
-void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
+_NORETURN_ void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
 {
        DEBUG(0,("ctdb fatal error: %s\n", msg));
        abort();
index 8acb79425114edb4c2ffca8bade910dfd7e75b39..d416a63374247a1dcc69a985e47c2057dc2b2cff 100644 (file)
@@ -52,7 +52,7 @@ struct cluster_state {
 */
 static struct server_id ctdb_id(struct cluster_ops *ops, uint32_t id)
 {
-       struct cluster_state *state = ops->private;
+       struct cluster_state *state = (struct cluster_state *)ops->private;
        struct ctdb_context *ctdb = state->ctdb;
        struct server_id server_id;
        server_id.node = ctdb_get_vnn(ctdb);
@@ -100,7 +100,7 @@ static struct tdb_wrap *ctdb_tdb_tmp_open(struct cluster_ops *ops,
 */
 static void *ctdb_backend_handle(struct cluster_ops *ops)
 {
-       struct cluster_state *state = ops->private;
+       struct cluster_state *state = (struct cluster_state *)ops->private;
        return (void *)state->ctdb;
 }
 
@@ -138,7 +138,7 @@ static NTSTATUS ctdb_message_init(struct cluster_ops *ops,
                                  struct server_id server,
                                  cluster_message_fn_t handler)
 {
-       struct cluster_state *state = ops->private;
+       struct cluster_state *state = (struct cluster_state *)ops->private;
        struct ctdb_handler_state *h;
        int ret;
 
@@ -169,7 +169,7 @@ static NTSTATUS ctdb_message_init(struct cluster_ops *ops,
 static NTSTATUS ctdb_message_send(struct cluster_ops *ops,
                                  struct server_id server, DATA_BLOB *data)
 {
-       struct cluster_state *state = ops->private;
+       struct cluster_state *state = (struct cluster_state *)ops->private;
        struct ctdb_context *ctdb = state->ctdb;
        TDB_DATA tdata;
        int ret;
index f5de138b52d35eaeaa683f6df69330e890bc1adf..1a16cb8321e6da6a14702ff056b8f565f86b66cc 100644 (file)
@@ -693,7 +693,7 @@ static int nsuniqueid_init(struct ldb_module *module)
 static int get_seq(struct ldb_context *ldb, void *context, 
                   struct ldb_reply *ares) 
 {
-       unsigned long long *max_seq = context;
+       unsigned long long *max_seq = (unsigned long long *)context;
        unsigned long long seq;
        if (ares->type == LDB_REPLY_ENTRY) {
                struct ldb_message_element *el = ldb_msg_find_element(ares->message, "contextCSN");
index 2d6d8a2d80196c93434246965ead07d539290c2d..27c13ddf60ed95eb9ab17c344a04ca044a0e82c6 100644 (file)
@@ -60,7 +60,7 @@ struct kludge_private_data {
 static enum user_is what_is_user(struct ldb_module *module) 
 {
        struct auth_session_info *session_info
-               = ldb_get_opaque(module->ldb, "sessionInfo");
+               = (struct auth_session_info *)ldb_get_opaque(module->ldb, "sessionInfo");
        if (!session_info) {
                return ANONYMOUS;
        }
@@ -87,7 +87,7 @@ static enum user_is what_is_user(struct ldb_module *module)
 static const char *user_name(TALLOC_CTX *mem_ctx, struct ldb_module *module) 
 {
        struct auth_session_info *session_info
-               = ldb_get_opaque(module->ldb, "sessionInfo");
+               = (struct auth_session_info *)ldb_get_opaque(module->ldb, "sessionInfo");
        if (!session_info) {
                return "UNKNOWN (NULL)";
        }
index 0675f38c566c1fc9aa479cb8fb69ade0ccea3c66..76e8578573e99ff367cd6ff087151938e13421e7 100644 (file)
@@ -678,8 +678,10 @@ static int partition_extended(struct ldb_module *module, struct ldb_request *req
 static int sort_compare(void *void1,
                        void *void2, void *opaque)
 {
-       struct dsdb_control_current_partition **pp1 = void1;
-       struct dsdb_control_current_partition **pp2 = void2;
+       struct dsdb_control_current_partition **pp1 = 
+               (struct dsdb_control_current_partition **)void1;
+       struct dsdb_control_current_partition **pp2 = 
+               (struct dsdb_control_current_partition **)void2;
        struct dsdb_control_current_partition *partition1 = talloc_get_type(*pp1,
                                                            struct dsdb_control_current_partition);
        struct dsdb_control_current_partition *partition2 = talloc_get_type(*pp2,
@@ -692,7 +694,8 @@ static const char *relative_path(struct ldb_module *module,
                                 TALLOC_CTX *mem_ctx, 
                                 const char *name) 
 {
-       const char *base_url = ldb_get_opaque(module->ldb, "ldb_url");
+       const char *base_url = 
+               (const char *)ldb_get_opaque(module->ldb, "ldb_url");
        char *path, *p, *full_name;
        if (name == NULL) {
                return NULL;
index fdc78e3cad23576d7ed0af0b28f9d9f546f7a912..31182a44d6eee3d2a667f95cf8db30e8e5883006 100644 (file)
@@ -1070,7 +1070,7 @@ const struct dom_sid *samdb_domain_sid(struct ldb_context *ldb)
        struct dom_sid *domain_sid;
 
        /* see if we have a cached copy */
-       domain_sid = ldb_get_opaque(ldb, "cache.domain_sid");
+       domain_sid = (struct dom_sid *)ldb_get_opaque(ldb, "cache.domain_sid");
        if (domain_sid) {
                return domain_sid;
        }
@@ -1137,7 +1137,7 @@ struct ldb_dn *samdb_ntds_settings_dn(struct ldb_context *ldb)
        struct ldb_dn *settings_dn;
        
        /* see if we have a cached copy */
-       settings_dn = ldb_get_opaque(ldb, "cache.settings_dn");
+       settings_dn = (struct ldb_dn *)ldb_get_opaque(ldb, "cache.settings_dn");
        if (settings_dn) {
                return settings_dn;
        }
@@ -1190,7 +1190,7 @@ const struct GUID *samdb_ntds_invocation_id(struct ldb_context *ldb)
        struct GUID *invocation_id;
        
        /* see if we have a cached copy */
-       invocation_id = ldb_get_opaque(ldb, "cache.invocation_id");
+       invocation_id = (struct GUID *)ldb_get_opaque(ldb, "cache.invocation_id");
        if (invocation_id) {
                return invocation_id;
        }
@@ -1240,7 +1240,8 @@ bool samdb_set_ntds_invocation_id(struct ldb_context *ldb, const struct GUID *in
        struct GUID *invocation_id_old;
 
        /* see if we have a cached copy */
-       invocation_id_old = ldb_get_opaque(ldb, "cache.invocation_id");
+       invocation_id_old = (struct GUID *)ldb_get_opaque(ldb, 
+                                                        "cache.invocation_id");
 
        tmp_ctx = talloc_new(ldb);
        if (tmp_ctx == NULL) {
@@ -1283,7 +1284,7 @@ const struct GUID *samdb_ntds_objectGUID(struct ldb_context *ldb)
        struct GUID *ntds_guid;
        
        /* see if we have a cached copy */
-       ntds_guid = ldb_get_opaque(ldb, "cache.ntds_guid");
+       ntds_guid = (struct GUID *)ldb_get_opaque(ldb, "cache.ntds_guid");
        if (ntds_guid) {
                return ntds_guid;
        }
@@ -1333,7 +1334,7 @@ bool samdb_set_ntds_objectGUID(struct ldb_context *ldb, const struct GUID *ntds_
        struct GUID *ntds_guid_old;
        
        /* see if we have a cached copy */
-       ntds_guid_old = ldb_get_opaque(ldb, "cache.ntds_guid");
+       ntds_guid_old = (struct GUID *)ldb_get_opaque(ldb, "cache.ntds_guid");
 
        tmp_ctx = talloc_new(ldb);
        if (tmp_ctx == NULL) {
index 3ded84c1845f7df268406b1f8d1c1b1ad0de0636..51343817b0029396675c4f36089d19622018fdc6 100644 (file)
@@ -38,10 +38,6 @@ static char *dsdb_subSchema_list_append(char *v, const char *list_name)
                NULL
        };
 
-       if (!attrs) {
-               return v;
-       }
-
        v = talloc_asprintf_append(v, "%s ( ", list_name);
        if (!v) return NULL;
 
index dc717daa6589b76b82de8305ae109fad52c19721..7c26675713802bd093fca4b53cb14816cb6856b3 100644 (file)
@@ -267,7 +267,8 @@ static BOOL kpasswd_process_request(struct kdc_server *kdc,
                                                        reply);
                }
                
-               password = talloc_strndup(mem_ctx, chpw.newpasswd.data, 
+               password = talloc_strndup(mem_ctx, 
+                                         (const char *)chpw.newpasswd.data, 
                                          chpw.newpasswd.length);
                if (!password) {
                        free_ChangePasswdDataMS(&chpw);
index 6bbf31dee766440d5e171aa26db576451021b78f..a7f72dd6d08d1d61151e1edb335dd5c2fb6867f8 100644 (file)
@@ -58,7 +58,7 @@ static const struct {
 */
 static void ltdb_attributes_unload(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message *msg;
        int i;
 
@@ -105,7 +105,7 @@ static int ltdb_attributes_flags(struct ldb_message_element *el, unsigned *v)
 */
 static int ltdb_attributes_load(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message *msg = ltdb->cache->attributes;
        struct ldb_dn *dn;
        int i, r;
@@ -172,7 +172,7 @@ failed:
 */
 static int ltdb_subclasses_load(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message *msg = ltdb->cache->subclasses;
        struct ldb_dn *dn;
        int i, j, r;
@@ -208,7 +208,7 @@ failed:
 */
 static void ltdb_subclasses_unload(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message *msg;
        int i;
 
@@ -232,7 +232,7 @@ static void ltdb_subclasses_unload(struct ldb_module *module)
 */
 static int ltdb_baseinfo_init(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message *msg;
        struct ldb_message_element el;
        struct ldb_val val;
@@ -285,7 +285,7 @@ failed:
  */
 static void ltdb_cache_free(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
 
        ltdb->sequence_number = 0;
        talloc_free(ltdb->cache);
@@ -308,7 +308,7 @@ int ltdb_cache_reload(struct ldb_module *module)
 */
 int ltdb_cache_load(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_dn *baseinfo_dn = NULL;
        struct ldb_dn *indexlist_dn = NULL;
        uint64_t seq;
@@ -417,7 +417,7 @@ failed:
 */
 int ltdb_increase_sequence_number(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message *msg;
        struct ldb_message_element el[2];
        struct ldb_val val;
index 1fe697f2776872c2d1b157264315a374dfed175a..bcab3acafe05aa6d28c04809df54cf9c8ea5e596 100644 (file)
@@ -45,7 +45,7 @@ static int ldb_list_find(const void *needle,
                         const void *base, size_t nmemb, size_t size, 
                         comparison_fn_t comp_fn)
 {
-       const char *base_p = base;
+       const char *base_p = (const char *)base;
        size_t min_i, max_i, test_i;
 
        if (nmemb == 0) {
@@ -1014,7 +1014,7 @@ static int ltdb_index_add1(struct ldb_module *module, const char *dn,
 static int ltdb_index_add0(struct ldb_module *module, const char *dn,
                           struct ldb_message_element *elements, int num_el)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        int ret;
        unsigned int i, j;
 
@@ -1138,7 +1138,7 @@ int ltdb_index_del_value(struct ldb_module *module, const char *dn,
 */
 int ltdb_index_del(struct ldb_module *module, const struct ldb_message *msg)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        int ret;
        const char *dn;
        unsigned int i, j;
@@ -1180,7 +1180,7 @@ int ltdb_index_del(struct ldb_module *module, const struct ldb_message *msg)
 */
 int ltdb_index_one(struct ldb_module *module, const struct ldb_message *msg, int add)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        struct ldb_message_element el;
        struct ldb_val val;
        struct ldb_dn *pdn;
@@ -1244,7 +1244,7 @@ static int delete_index(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, vo
 */
 static int re_index(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *state)
 {
-       struct ldb_module *module = state;
+       struct ldb_module *module = (struct ldb_module *)state;
        struct ldb_message *msg;
        const char *dn = NULL;
        int ret;
@@ -1309,7 +1309,7 @@ static int re_index(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *
 */
 int ltdb_reindex(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        int ret;
 
        if (ltdb_cache_reload(module) != 0) {
index 013b341d42a36a68bdd6378632f19d2a999679c9..a195a39391b55b2db2a37c4807e50860839630cf 100644 (file)
@@ -210,7 +210,7 @@ static struct ldb_message *ltdb_pull_attrs(struct ldb_module *module,
 */
 int ltdb_search_dn1(struct ldb_module *module, struct ldb_dn *dn, struct ldb_message *msg)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        int ret;
        TDB_DATA tdb_key, tdb_data;
 
@@ -252,7 +252,7 @@ int ltdb_search_dn1(struct ldb_module *module, struct ldb_dn *dn, struct ldb_mes
 */
 static int ltdb_lock_read(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        return tdb_lockall_read(ltdb->tdb);
 }
 
@@ -261,7 +261,7 @@ static int ltdb_lock_read(struct ldb_module *module)
 */
 static int ltdb_unlock_read(struct ldb_module *module)
 {
-       struct ltdb_private *ltdb = module->private_data;
+       struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
        return tdb_unlockall_read(ltdb->tdb);
 }
 
index c4c0d0e05970192a58f1da83b45674d81ad1602e..4b609b09e9756a811335bc2799dacd7eac70caa5 100644 (file)
@@ -504,7 +504,7 @@ NTSTATUS messaging_send_ptr(struct messaging_context *msg, struct server_id serv
 {
        DATA_BLOB blob;
 
-       blob.data = (void *)&ptr;
+       blob.data = (uint8_t *)&ptr;
        blob.length = sizeof(void *);
 
        return messaging_send(msg, server, msg_type, &blob);
index 8ccb96cbdcbc44c6b3bf2cba952a8021a1e4c786..035d556abf0cb7f299713ef2133394cd6ac7ebe7 100644 (file)
@@ -139,9 +139,8 @@ WERROR local_get_predefined_key (const struct registry_context *ctx,
                return WERR_NOT_FOUND;
        
        *key = reg_import_hive_key(ctx, mp->key, 
-                                                          mp->path.predefined_key, 
-                                                          mp->path.elements
-                                                          );
+                                  mp->path.predefined_key, 
+                                  mp->path.elements);
 
        return WERR_OK;
 }
index 993de19f9879a83ae081564be0fda66bf3be153e..ccabf4ca072786ca72f392021a30424d70528d69 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/registry/patchfile.h"
 #include "system/filesys.h"
 #include "pstring.h"
 
index d74ffd2b4baaf7956c0643757d0d978afc1ac416..0c40773daa68722fa05097863464503af33049d5 100644 (file)
@@ -1664,7 +1664,7 @@ static WERROR regf_set_value(struct hive_key *key, const char *name,
                        DATA_BLOB value_list;
 
                        value_list.length = (nk->num_values+1)*4;
-                       value_list.data = (void *)talloc_array(private_data, uint32_t, nk->num_values+1);
+                       value_list.data = talloc_array(private_data, uint32_t, nk->num_values+1);
                        W_ERROR_HAVE_NO_MEMORY(value_list.data);
                        memcpy(value_list.data, values.data, nk->num_values * 4);
 
index 131d76fff5ccf2bd74f0d0482bb4854d1a3b4c6e..cdf688b39eb85f9c8eadc0bfb850489b097d238c 100644 (file)
@@ -262,8 +262,7 @@ static WERROR cmd_rmval(struct regshell_context *ctx, int argc, char **argv)
        return WERR_OK; 
 }
 
-static WERROR cmd_exit(struct regshell_context *ctx,
-                                                                        int argc, char **argv)
+_NORETURN_ static WERROR cmd_exit(struct regshell_context *ctx, int argc, char **argv)
 {
        exit(0);
        return WERR_OK;
@@ -275,8 +274,7 @@ static struct {
        const char *name;
        const char *alias;
        const char *help;
-       WERROR (*handle)(struct regshell_context *ctx,
-                                                                  int argc, char **argv);
+       WERROR (*handle)(struct regshell_context *ctx, int argc, char **argv);
 } regshell_cmds[] = {
        {"ck", "cd", "Change current key", cmd_ck },
        {"info", "i", "Show detailed information of a key", cmd_info },
index 5cc944540730f13d4b2a722f3e39eb07950febaa..e9cd040ee6eb7ff5e3ef946c8a7d5696df2ab547 100644 (file)
@@ -153,7 +153,7 @@ _PUBLIC_ _NORETURN_ void smb_panic(const char *why)
 /**
 report a fault
 **/
-static void fault_report(int sig)
+_NORETURN_ static void fault_report(int sig)
 {
        static int counter;
        
@@ -172,7 +172,7 @@ static void fault_report(int sig)
 /**
 catch serious errors
 **/
-static void sig_fault(int sig)
+_NORETURN_ static void sig_fault(int sig)
 {
        if (fault_handlers.fault_handler) {
                /* we have a fault handler, call it. It may not return. */
index 4601833a3d263f8cbebc7c0ca46a3c01ce39fe9e..fc514980098a7877154c02000dbce1d60f1ff608 100644 (file)
@@ -269,7 +269,7 @@ _PUBLIC_ time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset)
        x2 = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16);
        SIVAL(&x,0,x2);
 
-       return pull_dos_date((void *)&x, zone_offset);
+       return pull_dos_date((const uint8_t *)&x, zone_offset);
 }
 
 /**
index 64f6f90d31f419ece4a23db6b1e45826b1046b25..06ff000acfab5528268be6620f8335baaff9b3c0 100644 (file)
@@ -497,7 +497,7 @@ BOOL ldap_encode(struct ldap_message *msg, DATA_BLOB *result, TALLOC_CTX *mem_ct
 static const char *blob2string_talloc(TALLOC_CTX *mem_ctx,
                                      DATA_BLOB blob)
 {
-       char *result = talloc_size(mem_ctx, blob.length+1);
+       char *result = talloc_array(mem_ctx, char, blob.length+1);
        memcpy(result, blob.data, blob.length);
        result[blob.length] = '\0';
        return result;
@@ -955,7 +955,7 @@ NTSTATUS ldap_decode(struct asn1_data *data, struct ldap_message *msg)
                                return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
                        }
                        if (pwlen != 0) {
-                               char *pw = talloc_size(msg, pwlen+1);
+                               char *pw = talloc_array(msg, char, pwlen+1);
                                if (!pw) {
                                        return NT_STATUS_LDAP(LDAP_OPERATIONS_ERROR);
                                }
@@ -1162,7 +1162,7 @@ NTSTATUS ldap_decode(struct asn1_data *data, struct ldap_message *msg)
                if (len == -1) {
                        return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
                }
-               dn = talloc_size(msg, len+1);
+               dn = talloc_array(msg, char, len+1);
                if (dn == NULL)
                        break;
                asn1_read(data, dn, len);
@@ -1198,7 +1198,7 @@ NTSTATUS ldap_decode(struct asn1_data *data, struct ldap_message *msg)
                        if (len == -1) {
                                return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
                        }
-                       newsup = talloc_size(msg, len+1);
+                       newsup = talloc_array(msg, char, len+1);
                        if (newsup == NULL) {
                                return NT_STATUS_LDAP(LDAP_OPERATIONS_ERROR);
                        }
index 597dc5a354b1e67178b2b98806ee893e44e9cc77..bb3e15d5de420ad0f1ce43671d4db27754c0f38f 100644 (file)
@@ -214,7 +214,8 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
        }
 
        /* find the matching request */
-       req = idr_find(nbtsock->idr, packet->name_trn_id);
+       req = (struct nbt_name_request *)idr_find(nbtsock->idr, 
+                                                 packet->name_trn_id);
        if (req == NULL) {
                if (nbtsock->unexpected.handler) {
                        nbtsock->unexpected.handler(nbtsock, packet, src);
index 4df4de020c16e35b10ea6d6b7ebf320c1b0878e4..63598fdd00c253f541114f54325190594946652d 100644 (file)
@@ -67,7 +67,7 @@ static const struct resolve_method *find_method(const char *name)
 */
 static void resolve_handler(struct composite_context *creq)
 {
-       struct composite_context *c = creq->async.private_data;
+       struct composite_context *c = (struct composite_context *)creq->async.private_data;
        struct resolve_state *state = talloc_get_type(c->private_data, struct resolve_state);
        const struct resolve_method *method = find_method(state->methods[0]);
 
index 64e418677a47871deeaabc273b89c37f5b486094..8d6bb797146a3b15b2e1e4a2d203ded5966d77ef 100644 (file)
@@ -278,7 +278,7 @@ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
        }
 
        maxlen = sid->num_auths * 11 + 25;
-       ret = talloc_size(mem_ctx, maxlen);
+       ret = talloc_array(mem_ctx, char, maxlen);
        if (!ret) return talloc_strdup(mem_ctx, "(SID ERR)");
 
        ia = (sid->id_auth[5]) +
index 392fec1cb917e36dd24df0060df5b3d8b2ba39a9..545f3c8353748b0f07777b1f56910c533db43cba 100644 (file)
@@ -67,7 +67,7 @@ struct smb2_request *smb2_request_init(struct smb2_transport *transport, uint16_
        req->out.size      = SMB2_HDR_BODY+NBT_HDR_SIZE+body_fixed_size;
 
        req->out.allocated = req->out.size + body_dynamic_size;
-       req->out.buffer    = talloc_size(req, req->out.allocated);
+       req->out.buffer    = talloc_array(req, uint8_t, req->out.allocated);
        if (req->out.buffer == NULL) {
                talloc_free(req);
                return NULL;
index e7a2e163aaa967fe5df64c524099dcb207e76166..8bd091a3195730f9f8aecf9dfb61937cb449cc34 100644 (file)
@@ -600,7 +600,7 @@ BOOL asn1_read_LDAPString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s)
                data->has_error = True;
                return False;
        }
-       *s = talloc_size(mem_ctx, len+1);
+       *s = talloc_array(mem_ctx, char, len+1);
        if (! *s) {
                data->has_error = True;
                return False;
index 09a2680190f6fb9249c72a28de1d71b6a55c1698..522031b8e419772413c8f049641f48b3f5b4da94 100644 (file)
@@ -269,7 +269,7 @@ enum ndr_compression_alg {
 
 
 #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \
-       (s) = talloc_size(ndr, size); \
+       (s) = talloc_array(ndr, uint8_t, size); \
        if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed: %s\n", (unsigned)size, __location__); \
 } while (0)
 
index 9fb39beff3244c3aa1533eebe547e828d5a0a91b..a9e42f1eb6a961f6defa9ab52c7a1c84688003b7 100644 (file)
@@ -200,13 +200,16 @@ _PUBLIC_ void ndr_print_string_helper(struct ndr_print *ndr, const char *format,
        int i;
 
        for (i=0;i<ndr->depth;i++) {
-               ndr->private_data = talloc_asprintf_append(ndr->private_data, "    ");
+               ndr->private_data = talloc_asprintf_append(
+                                       (char *)ndr->private_data, "    ");
        }
 
        va_start(ap, format);
-       ndr->private_data = talloc_vasprintf_append(ndr->private_data, format, ap);
+       ndr->private_data = talloc_vasprintf_append((char *)ndr->private_data, 
+                                                   format, ap);
        va_end(ap);
-       ndr->private_data = talloc_asprintf_append(ndr->private_data, "\n");
+       ndr->private_data = talloc_asprintf_append((char *)ndr->private_data, 
+                                                  "\n");
 }
 
 /*
@@ -276,7 +279,7 @@ _PUBLIC_ char *ndr_print_struct_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, c
        ndr->depth = 1;
        ndr->flags = 0;
        fn(ndr, name, ptr);
-       ret = talloc_steal(mem_ctx, ndr->private_data);
+       ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
 failed:
        talloc_free(ndr);
        return ret;
@@ -301,7 +304,7 @@ _PUBLIC_ char *ndr_print_union_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, co
        ndr->flags = 0;
        ndr_print_set_switch_value(ndr, ptr, level);
        fn(ndr, name, ptr);
-       ret = talloc_steal(mem_ctx, ndr->private_data);
+       ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
 failed:
        talloc_free(ndr);
        return ret;
@@ -327,7 +330,7 @@ _PUBLIC_ char *ndr_print_function_string(TALLOC_CTX *mem_ctx,
        ndr->depth = 1;
        ndr->flags = 0;
        fn(ndr, name, flags, ptr);
-       ret = talloc_steal(mem_ctx, ndr->private_data);
+       ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
 failed:
        talloc_free(ndr);
        return ret;
index fca864a5ebf1eb56e76aca750a1feffee6668e01..b611f87a41a4c59fb2611ddaba4adad4ac3ad83c 100644 (file)
@@ -640,7 +640,7 @@ _PUBLIC_ uint32_t ndr_string_length(const void *_var, uint32_t element_size)
 {
        uint32_t i;
        uint8_t zero[4] = {0,0,0,0};
-       const char *var = _var;
+       const char *var = (const char *)_var;
 
        for (i = 0; memcmp(var+i*element_size,zero,element_size) != 0; i++);
 
@@ -731,5 +731,5 @@ _PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset)
 {
        /* FIXME: Treat special chars special here, taking chset into account */
        /* Also include 0 byte */
-       return strlen(var)+1;
+       return strlen((const char *)var)+1;
 }
index 160b9772f48abc6a9fb3081c8030681da29d479a..56e603645cbe3293244966704b7574ffc4206b80 100644 (file)
@@ -959,7 +959,7 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
        req->recv_handler = NULL;
 
        if (object != NULL) {
-               req->object = talloc_memdup(req, (void *)object, sizeof(*object));
+               req->object = (struct GUID *)talloc_memdup(req, (void *)object, sizeof(*object));
                if (req->object == NULL) {
                        talloc_free(req);
                        return NULL;
index 974cbd269201703f1cc7cebfa8c581051f5128e5..a28b21b5c351c41c08eb4deaa39875091d20deeb 100644 (file)
@@ -193,7 +193,7 @@ static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data,
 */
 static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p, NTSTATUS status)
 {
-       struct sock_private *sock = p->transport.private_data;
+       struct sock_private *sock = (struct sock_private *)p->transport.private_data;
 
        if (sock && sock->sock) {
                sock_dead(p, status);
index e94207bf36f02bc7a461bcd421d1f759e3375154..fc26fddfd58a2b4b3edd8d0b49ed04c9b936a9c6 100644 (file)
@@ -483,7 +483,7 @@ static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
                return -1;
        }
 
-       tree = talloc_check_name(argv[0]->ptr, "struct smbcli_tree");
+       tree = talloc_get_type(argv[0]->ptr, struct smbcli_tree);
 
        result = smb_tree_disconnect(tree);
 
@@ -512,7 +512,7 @@ static int ejs_mkdir(MprVarHandle eid, int argc, MprVar **argv)
                return -1;
        }
 
-       tree = argv[0]->ptr;
+       tree = (struct smbcli_tree *)argv[0]->ptr;
 
        if (!mprVarIsString(argv[1]->type)) {
                ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -546,7 +546,7 @@ static int ejs_rmdir(MprVarHandle eid, int argc, MprVar **argv)
                return -1;
        }
 
-       tree = argv[0]->ptr;
+       tree = (struct smbcli_tree *)argv[0]->ptr;
 
        if (!mprVarIsString(argv[1]->type)) {
                ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -580,7 +580,7 @@ static int ejs_rename(MprVarHandle eid, int argc, MprVar **argv)
                return -1;
        }
 
-       tree = argv[0]->ptr;
+       tree = (struct smbcli_tree *)argv[0]->ptr;
 
        if (!mprVarIsString(argv[1]->type)) {
                ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -619,7 +619,7 @@ static int ejs_unlink(MprVarHandle eid, int argc, MprVar **argv)
                return -1;
        }
 
-       tree = argv[0]->ptr;
+       tree = (struct smbcli_tree *)argv[0]->ptr;
 
        if (!mprVarIsString(argv[1]->type)) {
                ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -666,7 +666,7 @@ static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
                return -1;
        }
 
-       tree = argv[0]->ptr;
+       tree = (struct smbcli_tree *)argv[0]->ptr;
 
        if (!mprVarIsString(argv[1]->type)) {
                ejsSetErrorMsg(eid, "arg 2 must be a string");
index 4addd473dab2bda37482e5a0de4e75c7518d4afb..b95681d4ef319f6263bd1f92a21611335125a378 100644 (file)
@@ -144,7 +144,8 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 
        credentials = mprGetProperty(this, "credentials", NULL);
        if (credentials) {
-               creds = mprGetPtr(credentials, "creds");
+               creds = (struct cli_credentials *)
+                               mprGetPtr(credentials, "creds");
        } else {
                creds = cmdline_credentials;
        }
@@ -188,7 +189,7 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
        int i, count;
        struct MprVar *results;
 
-       p = mprGetThisPtr(eid, "irpc");
+       p = (struct ejs_irpc_connection *)mprGetThisPtr(eid, "irpc");
 
        ejs = talloc(mprMemCtx(), struct ejs_rpc);
        if (ejs == NULL) {
index 0b5f1fb88a99f1808d412837722353f94fa0403c..660009704b9f44515a885847e8cd80f7f443422a 100644 (file)
@@ -381,9 +381,9 @@ static bool setpathinfo_aliases(struct torture_context *tctx,
 
 
 /* look for aliased info levels in trans2 calls */
-struct torture_suite *torture_trans2_aliases(void)
+struct torture_suite *torture_trans2_aliases(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ALIASES");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "ALIASES");
 
        torture_suite_add_1smb_test(suite, "QFILEINFO aliases", qfsinfo_aliases);
        torture_suite_add_1smb_test(suite, "QFSINFO aliases", qfileinfo_aliases);
index 4c6a7a3ab6c8bb7e022cc694599e880d0527c714..07071bb68a01439c72eff6caade47283c0b428db 100644 (file)
@@ -86,8 +86,8 @@ static const struct trunc_open_results attr_results[] = {
 };
 
 
-BOOL torture_openattrtest(struct torture_context *tctx, 
-                                                 struct smbcli_state *cli1)
+bool torture_openattrtest(struct torture_context *tctx, 
+                         struct smbcli_state *cli1)
 {
        const char *fname = "\\openattr.file";
        int fnum1;
index 2cb0c6a98506e52e6c75ca64d6c3916f5beaa492..8c510efab48c03899c24edccc4c46bd3cb3c0276 100644 (file)
@@ -1715,7 +1715,7 @@ NTSTATUS torture_base_init(void)
        struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "BASE");
 
        torture_suite_add_2smb_test(suite, "FDPASS", run_fdpasstest);
-       torture_suite_add_suite(suite, torture_base_locktest());
+       torture_suite_add_suite(suite, torture_base_locktest(suite));
        torture_suite_add_1smb_test(suite, "UNLINK", torture_unlinktest);
        torture_suite_add_1smb_test(suite, "ATTR",   run_attrtest);
        torture_suite_add_1smb_test(suite, "TRANS2", run_trans2test);
@@ -1750,7 +1750,7 @@ NTSTATUS torture_base_init(void)
        torture_suite_add_1smb_test(suite, "CASETABLE", torture_casetable);
        torture_suite_add_1smb_test(suite, "UTABLE", torture_utable);
        torture_suite_add_simple_test(suite, "SMB", torture_smb_scan);
-       torture_suite_add_suite(suite, torture_trans2_aliases());
+       torture_suite_add_suite(suite, torture_trans2_aliases(suite));
        torture_suite_add_1smb_test(suite, "TRANS2-SCAN", torture_trans2_scan);
        torture_suite_add_1smb_test(suite, "NTTRANS", torture_nttrans_scan);
 
index 98f4323ce63b9f9c81802053e86470d89c271017..05c613d64786d2e41e37687f9e7b9df4e1484e87 100644 (file)
@@ -1410,8 +1410,8 @@ static void progress_bar(struct torture_context *tctx, uint_t i, uint_t total)
 /*
   this produces a matrix of deny mode behaviour for 1 connection
  */
-BOOL torture_denytest1(struct torture_context *tctx, 
-                                          struct smbcli_state *cli1)
+bool torture_denytest1(struct torture_context *tctx, 
+                      struct smbcli_state *cli1)
 {
        int fnum1, fnum2;
        int i;
@@ -1500,9 +1500,9 @@ failed:
 /*
   this produces a matrix of deny mode behaviour with 2 connections
  */
-BOOL torture_denytest2(struct torture_context *tctx, 
-                                          struct smbcli_state *cli1, 
-                                          struct smbcli_state *cli2)
+bool torture_denytest2(struct torture_context *tctx, 
+                      struct smbcli_state *cli1, 
+                      struct smbcli_state *cli2)
 {
        int fnum1, fnum2;
        int i;
@@ -1588,9 +1588,9 @@ failed:
 /*
    simple test harness for playing with deny modes
  */
-BOOL torture_denytest3(struct torture_context *tctx, 
-                                          struct smbcli_state *cli1,
-                                          struct smbcli_state *cli2)
+bool torture_denytest3(struct torture_context *tctx, 
+                      struct smbcli_state *cli1,
+                      struct smbcli_state *cli2)
 {
        int fnum1, fnum2;
        const char *fname;
@@ -1889,7 +1889,8 @@ failed:
 /*
   a denytest for ntcreatex
  */
-BOOL torture_ntdenytest1(struct torture_context *tctx, struct smbcli_state *cli, int client)
+bool torture_ntdenytest1(struct torture_context *tctx, 
+                        struct smbcli_state *cli, int client)
 {
        extern int torture_seed;
 
@@ -1903,9 +1904,9 @@ BOOL torture_ntdenytest1(struct torture_context *tctx, struct smbcli_state *cli,
 /*
   a denytest for ntcreatex
  */
-BOOL torture_ntdenytest2(struct torture_context *torture, 
-                                                struct smbcli_state *cli1,
-                                                struct smbcli_state *cli2)
+bool torture_ntdenytest2(struct torture_context *torture, 
+                        struct smbcli_state *cli1,
+                        struct smbcli_state *cli2)
 {
        return torture_ntdenytest(torture, cli1, cli2, 0);
 }
@@ -1929,8 +1930,8 @@ BOOL torture_ntdenytest2(struct torture_context *torture,
 /*
   test sharing of handles with DENY_DOS on a single connection
 */
-BOOL torture_denydos_sharing(struct torture_context *tctx, 
-                                                        struct smbcli_state *cli)
+bool torture_denydos_sharing(struct torture_context *tctx, 
+                            struct smbcli_state *cli)
 {
        union smb_open io;
        union smb_fileinfo finfo;
index 8b371882998a3bb527fe9e2b1b22e542d6299a37..9f9122fe327f4f1552496b06d8fce75108f03d59 100644 (file)
@@ -33,8 +33,8 @@ static void list_fn(struct clilist_file_info *finfo, const char *name, void *sta
 /*
   test directory listing speed
  */
-BOOL torture_dirtest1(struct torture_context *tctx, 
-                                         struct smbcli_state *cli)
+bool torture_dirtest1(struct torture_context *tctx, 
+                     struct smbcli_state *cli)
 {
        int i;
        int fnum;
@@ -76,8 +76,8 @@ BOOL torture_dirtest1(struct torture_context *tctx,
        return correct;
 }
 
-BOOL torture_dirtest2(struct torture_context *tctx, 
-                                         struct smbcli_state *cli)
+bool torture_dirtest2(struct torture_context *tctx, 
+                     struct smbcli_state *cli)
 {
        int i;
        int fnum, num_seen;
index e05e3ef0828351b2f7e401fe8b7abcb24f34c0b9..1dab4b0cae5ebed352c133ab0c8154dacfe06208 100644 (file)
@@ -126,7 +126,7 @@ static BOOL test_disconnect_lock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 /* 
    basic testing of disconnects
 */
-BOOL torture_disconnect(struct torture_context *torture)
+bool torture_disconnect(struct torture_context *torture)
 {
        BOOL ret = True;
        TALLOC_CTX *mem_ctx;
index aa3168fb086d3ed73632b4ec992dfc79cc978b46..0d66ecf30b9045dcec61bb836d4d23352f562c40 100644 (file)
@@ -795,10 +795,9 @@ fail:
        return correct;
 }
 
-struct torture_suite *torture_base_locktest(void)
+struct torture_suite *torture_base_locktest(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), 
-                                                                                                          "LOCK");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCK");
        torture_suite_add_2smb_test(suite, "LOCK1", torture_locktest1);
        torture_suite_add_1smb_test(suite, "LOCK2", torture_locktest2);
        torture_suite_add_2smb_test(suite, "LOCK3", torture_locktest3);
index 665360fc64344cfc2e3101540095907e5393b048..d13450dd3a3b94a1af1491ad5abe598508d238b6 100644 (file)
@@ -155,8 +155,8 @@ static void gen_name(char *name)
 }
 
 
-BOOL torture_mangle(struct torture_context *torture, 
-                                       struct smbcli_state *cli)
+bool torture_mangle(struct torture_context *torture, 
+                   struct smbcli_state *cli)
 {
        extern int torture_numops;
        int i;
index 6a8e84cc2f414fd2f6155a5683532c5fd74a0810..f389fa35f91adc8bcce1fbd5d4bb521680d09f62 100644 (file)
@@ -88,8 +88,8 @@ static void show_bits(const struct bitmapping *bm, uint32_t value)
 /*
   print out server properties
  */
-BOOL torture_test_properties(struct torture_context *torture, 
-                                                        struct smbcli_state *cli)
+bool torture_test_properties(struct torture_context *torture, 
+                            struct smbcli_state *cli)
 {
        BOOL correct = True;
        union smb_fsinfo fs;
index 572048e0ea6086499c54e9131abd408c12dc0013..12fd5e1c99e770092f1128fe33cf33aade6e4854 100644 (file)
@@ -27,8 +27,8 @@
 /*
   Test rename on files open with share delete and no share delete.
  */
-BOOL torture_test_rename(struct torture_context *tctx,
-                                                struct smbcli_state *cli1)
+bool torture_test_rename(struct torture_context *tctx, 
+                        struct smbcli_state *cli1)
 {
        const char *fname = "\\test.txt";
        const char *fname1 = "\\test1.txt";
index 60d5a1554d2a846d1a4f4c0e9c32a7196ed866d7..bb829051a209089bc107aa3c9d734f7125ae585b 100644 (file)
@@ -33,7 +33,7 @@
 
   1) the server does not allow an unlink on a file that is open
 */
-BOOL torture_unlinktest(struct torture_context *tctx, struct smbcli_state *cli)
+bool torture_unlinktest(struct torture_context *tctx, struct smbcli_state *cli)
 {
        const char *fname = BASEDIR "\\unlink.tst";
        int fnum;
index 9624a7b14fbc0e48d14cb9f7806dcd89f1d062aa..e35b9d14ab8de24293d2450ec99e5e1381d6c4c7 100644 (file)
@@ -386,7 +386,7 @@ static struct smbcli_state *c;
 static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, 
                           uint16_t fnum, uint8_t level, void *private)
 {
-       struct smbcli_tree *tree = private;
+       struct smbcli_tree *tree = (struct smbcli_tree *)private;
        return smbcli_oplock_ack(tree, fnum, OPLOCK_BREAK_TO_NONE);
 }
 
index 2effe25ab768ea2cb82f2b7d26910d88b0a8debe..ee97242de50bc42813d8203d6e88207cbb418344 100644 (file)
@@ -42,7 +42,7 @@ static void netlogon_handler(struct dgram_mailslot_handler *dgmslot,
 {
        NTSTATUS status;
        struct nbt_netlogon_packet netlogon;
-       int *replies = dgmslot->private;
+       int *replies = (int *)dgmslot->private;
 
        printf("netlogon reply from %s:%d\n", src->addr, src->port);
 
@@ -227,7 +227,7 @@ static void ntlogon_handler(struct dgram_mailslot_handler *dgmslot,
 {
        NTSTATUS status;
        struct nbt_ntlogon_packet ntlogon;
-       int *replies = dgmslot->private;
+       int *replies = (int *)dgmslot->private;
 
        printf("ntlogon reply from %s:%d\n", src->addr, src->port);
 
index 78f6352ed6fdbad090f4af0e4b8ec90ca3fb39e9..0d9e7586479272a010c2ab7718ae46d10e0f815d 100644 (file)
@@ -220,7 +220,7 @@ static bool test_assoc_ctx2(struct torture_context *tctx)
 /*
   display a replication entry
 */
-static void display_entry(TALLOC_CTX *tctx, struct wrepl_name *name)
+static void display_entry(struct torture_context *tctx, struct wrepl_name *name)
 {
        int i;
 
@@ -537,8 +537,8 @@ static const struct wrepl_ip addresses_X_3_4[] = {
        }
 };
 
-static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *tctx,
-                                                                const char *address)
+static struct test_wrepl_conflict_conn *test_create_conflict_ctx(
+               struct torture_context *tctx, const char *address)
 {
        struct test_wrepl_conflict_conn *ctx;
        struct wrepl_associate associate;
@@ -9450,7 +9450,8 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 {
        struct nbt_name *name;
        struct nbt_name_packet *rep_packet;
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        _NBT_ASSERT(req_packet->qdcount, 1);
        _NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9546,7 +9547,8 @@ static void test_conflict_owned_active_vs_replica_handler_release(
 {
        struct nbt_name *name;
        struct nbt_name_packet *rep_packet;
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        _NBT_ASSERT(req_packet->qdcount, 1);
        _NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9597,7 +9599,8 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
                                                          struct nbt_name_packet *req_packet, 
                                                          struct socket_address *src)
 {
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        rec->defend.ret = false;
 
index a56afee54642e35ca428ee931d6c4480a1010500..6240584a681ff903b8a51ac37b57a28e785c42ce 100644 (file)
@@ -215,7 +215,7 @@ done:
    basic testing of chkpath calls 
 */
 bool torture_raw_chkpath(struct torture_context *torture, 
-                                                struct smbcli_state *cli)
+                        struct smbcli_state *cli)
 {
        bool ret = true;
        int fnum;
index 34ac2f0db88440b21a3a85435704227980cf8e5b..6f139f8530df9187761561fbf80ebde460034bc2 100644 (file)
@@ -28,7 +28,7 @@
  * basic testing of all RAW_CLOSE_* calls 
 */
 bool torture_raw_close(struct torture_context *torture,
-                                          struct smbcli_state *cli)
+                      struct smbcli_state *cli)
 {
        bool ret = true;
        union smb_close io;
index 374ff3cb984b0086347ec657bbbd5b29c280a253..e66ebcde023d3b786ea667a19ff3bdd03e2c741b 100644 (file)
@@ -400,7 +400,7 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
    basic testing of libcli composite calls
 */
 bool torture_raw_composite(struct torture_context *tctx, 
-                                                  struct smbcli_state *cli)
+                          struct smbcli_state *cli)
 {
        bool ret = true;
 
index df7f5f3851257e7fff33c08596d5a9e831741fad..11cb91768b6f3d194590333ce145a211f51f691b 100644 (file)
@@ -886,7 +886,7 @@ static bool torture_raw_context_int(struct torture_context *tctx,
    basic testing of session/tree context calls
 */
 bool torture_raw_context(struct torture_context *torture, 
-                                                struct smbcli_state *cli)
+                        struct smbcli_state *cli)
 {
        bool ret = true;
        if (lp_use_spnego()) {
index 7e9c742943f049494cf3c268e1bfa4213fb04e6a..b6eedbc5860fab7a6101c92f0d43508c668c3ce5 100644 (file)
@@ -463,7 +463,7 @@ bool torture_raw_eas(struct torture_context *torture, struct smbcli_state *cli)
 /* 
    test max EA size
 */
-BOOL torture_max_eas(struct torture_context *torture)
+bool torture_max_eas(struct torture_context *torture)
 {
        struct smbcli_state *cli;
        BOOL ret = True;
index 8e98822e112fee5b9de60f67ed1aba03d1125428..357332c716879a85576a0a922cd7661d9f464561 100644 (file)
@@ -152,7 +152,7 @@ done:
    basic testing of some ioctl calls 
 */
 bool torture_raw_ioctl(struct torture_context *torture, 
-                                          struct smbcli_state *cli)
+                      struct smbcli_state *cli)
 {
        bool ret = true;
 
index 0e2fd1afe0932d03d3255a23926f544652d2870f..071783a27701e51a344cc2d1f86bc5e79df3cea5 100644 (file)
@@ -160,8 +160,8 @@ done:
 /* 
    basic testing of all RAW_MKDIR_* calls 
 */
-BOOL torture_raw_mkdir(struct torture_context *torture, 
-                                          struct smbcli_state *cli)
+bool torture_raw_mkdir(struct torture_context *torture, 
+                      struct smbcli_state *cli)
 {
        bool ret = true;
 
index 1540a4a2dd2d27a3fbbe1436dc123e1b428401c6..7d0d46d3d1e307b96389d615f4af526fb884e4a6 100644 (file)
@@ -1019,7 +1019,7 @@ done:
 
 static void tcp_dis_handler(struct smbcli_transport *t, void *p)
 {
-       struct smbcli_state *cli = p;
+       struct smbcli_state *cli = (struct smbcli_state *)p;
        smbcli_transport_dead(cli->transport, NT_STATUS_LOCAL_DISCONNECT);
        cli->transport = NULL;
        cli->tree = NULL;
@@ -1284,8 +1284,8 @@ done:
    basic testing of change notify
 */
 bool torture_raw_notify(struct torture_context *torture, 
-                                               struct smbcli_state *cli, 
-                                               struct smbcli_state *cli2)
+                       struct smbcli_state *cli, 
+                       struct smbcli_state *cli2)
 {
        bool ret = true;
                
index 7a921af422e1c301fb71ba7f187930d7b9ca5af4..ad7676dcac15f529462d996b8007aa3d549d4f9a 100644 (file)
@@ -53,10 +53,11 @@ static struct {
 /*
   a handler function for oplock break requests. Ack it as a break to level II if possible
 */
-static BOOL oplock_handler_ack_to_levelII(struct smbcli_transport *transport, uint16_t tid, 
-                              uint16_t fnum, uint8_t level, void *private)
+static bool oplock_handler_ack_to_levelII(struct smbcli_transport *transport, 
+                                         uint16_t tid, uint16_t fnum, 
+                                         uint8_t level, void *private)
 {
-       struct smbcli_tree *tree = private;
+       struct smbcli_tree *tree = (struct smbcli_tree *)private;
        break_info.fnum = fnum;
        break_info.level = level;
        break_info.count++;
@@ -69,11 +70,11 @@ static BOOL oplock_handler_ack_to_levelII(struct smbcli_transport *transport, ui
 /*
   a handler function for oplock break requests. Ack it as a break to none
 */
-static BOOL oplock_handler_ack_to_none(struct smbcli_transport *transport, uint16_t tid
-                                   uint16_t fnum, uint8_t level
-                                   void *private)
+static bool oplock_handler_ack_to_none(struct smbcli_transport *transport
+                                      uint16_t tid, uint16_t fnum
+                                      uint8_t level, void *private)
 {
-       struct smbcli_tree *tree = private;
+       struct smbcli_tree *tree = (struct smbcli_tree *)private;
        break_info.fnum = fnum;
        break_info.level = level;
        break_info.count++;
@@ -100,7 +101,7 @@ static BOOL oplock_handler_close(struct smbcli_transport *transport, uint16_t ti
                                 uint16_t fnum, uint8_t level, void *private)
 {
        union smb_close io;
-       struct smbcli_tree *tree = private;
+       struct smbcli_tree *tree = (struct smbcli_tree *)private;
        struct smbcli_request *req;
 
        break_info.fnum = fnum;
@@ -1406,10 +1407,11 @@ static struct hold_oplock_info {
          NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, },
 };
 
-static BOOL oplock_handler_hold(struct smbcli_transport *transport, uint16_t tid, 
-                               uint16_t fnum, uint8_t level, void *private)
+static bool oplock_handler_hold(struct smbcli_transport *transport, 
+                               uint16_t tid, uint16_t fnum, uint8_t level, 
+                               void *private)
 {
-       struct smbcli_tree *tree = private;
+       struct smbcli_tree *tree = (struct smbcli_tree *)private;
        struct hold_oplock_info *info;
        int i;
 
@@ -1444,7 +1446,8 @@ static BOOL oplock_handler_hold(struct smbcli_transport *transport, uint16_t tid
 BOOL torture_hold_oplock(struct torture_context *torture, 
                         struct smbcli_state *cli)
 {
-       struct event_context *ev = cli->transport->socket->event.ctx;
+       struct event_context *ev = 
+               (struct event_context *)cli->transport->socket->event.ctx;
        int i;
 
        printf("Setting up open files with oplocks in %s\n", BASEDIR);
index f1048f25ac0669953d67d1e64c1e27478df42337..3c108dce2d2a8110f1fa0cac0e390e16e0461237 100644 (file)
@@ -93,7 +93,7 @@ static bool test_read(struct torture_context *tctx, struct smbcli_state *cli)
        const char *test_data = "TEST DATA";
        uint_t seed = time(NULL);
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -220,7 +220,7 @@ static bool test_lockread(struct torture_context *tctx,
        const char *test_data = "TEST DATA";
        uint_t seed = time(NULL);
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -365,7 +365,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli)
        const char *test_data = "TEST DATA";
        uint_t seed = time(NULL);
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -604,7 +604,7 @@ static bool test_readbraw(struct torture_context *tctx,
        const char *test_data = "TEST DATA";
        uint_t seed = time(NULL);
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -778,7 +778,7 @@ static bool test_read_for_execute(struct torture_context *tctx,
        const char *fname = BASEDIR "\\test.txt";
        const uint8_t data[] = "TEST DATA";
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
index 3fe151f0091c9c612cd370e79569113efbc27017..309f65487a532891b0c6f0682bf34fc0761d3fa7 100644 (file)
@@ -125,7 +125,7 @@ static NTSTATUS smbcli_chmod(struct smbcli_tree *tree, const char *fname,
        return smb_raw_setpathinfo(tree, &sfinfo);
 }
 
-BOOL torture_samba3_hide(struct torture_context *torture)
+bool torture_samba3_hide(struct torture_context *torture)
 {
        struct smbcli_state *cli;
        const char *fname = "test.txt";
@@ -274,7 +274,7 @@ BOOL torture_samba3_hide(struct torture_context *torture)
  * close. smb_close should return NT_STATUS_ACCESS_DENIED.
  */
 
-BOOL torture_samba3_closeerr(struct torture_context *tctx)
+bool torture_samba3_closeerr(struct torture_context *tctx)
 {
        struct smbcli_state *cli = NULL;
        BOOL result = False;
index e1b1fcaf6d513f85d6f642d3cf252c65edfb9c5c..57595dab4466a8fb5cff9a18279b0dfbc0212ebd 100644 (file)
@@ -34,7 +34,7 @@
        } \
 } while (0)
 
-BOOL torture_samba3_checkfsp(struct torture_context *torture)
+bool torture_samba3_checkfsp(struct torture_context *torture)
 {
        struct smbcli_state *cli;
        const char *fname = "test.txt";
@@ -323,7 +323,7 @@ static NTSTATUS raw_smbcli_ntcreate(struct smbcli_tree *tree, const char *fname,
 }
 
 
-BOOL torture_samba3_badpath(struct torture_context *torture)
+bool torture_samba3_badpath(struct torture_context *torture)
 {
        struct smbcli_state *cli_nt;
        struct smbcli_state *cli_dos;
@@ -607,7 +607,7 @@ static void count_fn(struct clilist_file_info *info, const char *name,
        *counter += 1;
 }
 
-BOOL torture_samba3_caseinsensitive(struct torture_context *torture)
+bool torture_samba3_caseinsensitive(struct torture_context *torture)
 {
        struct smbcli_state *cli;
        TALLOC_CTX *mem_ctx;
@@ -672,7 +672,7 @@ BOOL torture_samba3_caseinsensitive(struct torture_context *torture)
  * on an underlying file
  */
 
-BOOL torture_samba3_posixtimedlock(struct torture_context *tctx)
+bool torture_samba3_posixtimedlock(struct torture_context *tctx)
 {
        struct smbcli_state *cli;
        NTSTATUS status;
index b1931d93595e31c7ccb8dd02bcb0565cd7c79af1..7b6529245b3d0da34afc4139f49e6b5c0ff23198 100644 (file)
@@ -32,7 +32,7 @@
 */
 static BOOL single_search_callback(void *private, const union smb_search_data *file)
 {
-       union smb_search_data *data = private;
+       union smb_search_data *data = (union smb_search_data *)private;
 
        *data = *file;
 
@@ -511,7 +511,7 @@ struct multiple_result {
 */
 static BOOL multiple_search_callback(void *private, const union smb_search_data *file)
 {
-       struct multiple_result *data = private;
+       struct multiple_result *data = (struct multiple_result *)private;
 
 
        data->count++;
@@ -541,7 +541,7 @@ static NTSTATUS multiple_search(struct smbcli_state *cli,
        union smb_search_next io2;
        NTSTATUS status;
        const int per_search = 100;
-       struct multiple_result *result = data;
+       struct multiple_result *result = (struct multiple_result *)data;
 
        if (data_level == RAW_SEARCH_DATA_SEARCH) {
                io.search_first.level = RAW_SEARCH_SEARCH;
index 24428efcf7c7667bd81dcc15d889dbfd9e591293..c51c6ea2dfb221d6b6791c04f2b43f3366b228db 100644 (file)
@@ -73,7 +73,7 @@ static BOOL check_stream(struct smbcli_state *cli, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       buf = talloc_size(mem_ctx, strlen(value)+11);
+       buf = talloc_array(mem_ctx, uint8_t, strlen(value)+11);
        
        ret = smbcli_read(cli->tree, fnum, buf, 0, strlen(value)+11);
        if (ret != strlen(value)) {
index c307b14e08452a556efcbfb0cecfb585f12343fa..860a09727dbb6e1f5601870626b6cef17f5bffc4 100644 (file)
@@ -439,8 +439,7 @@ done:
 */
 struct torture_suite *torture_raw_unlink(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, 
-                                                                                                          "UNLINK");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "UNLINK");
 
        torture_suite_add_1smb_test(suite, "unlink", test_unlink);
        torture_suite_add_1smb_test(suite, "delete_on_close", test_delete_on_close);
index b704a19ed65c37b99672e25586611147478e6e8b..6151c60a715e6851de182154a903831129140c5b 100644 (file)
@@ -108,7 +108,7 @@ static bool test_write(struct torture_context *tctx,
        uint_t seed = time(NULL);
        union smb_fileinfo finfo;
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -242,7 +242,7 @@ static bool test_writex(struct torture_context *tctx,
                torture_comment(tctx, "dangerous not set - limiting range of test to 2^%d\n", max_bits);
        }
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -424,7 +424,7 @@ static bool test_writeunlock(struct torture_context *tctx,
        uint_t seed = time(NULL);
        union smb_fileinfo finfo;
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
@@ -567,7 +567,7 @@ static bool test_writeclose(struct torture_context *tctx,
        uint_t seed = time(NULL);
        union smb_fileinfo finfo;
 
-       buf = talloc_zero_size(tctx, maxsize);
+       buf = talloc_zero_array(tctx, uint8_t, maxsize);
 
        if (!torture_setup_dir(cli, BASEDIR)) {
                return False;
index f999995dafb0f70d2e157b724c8f07ff10093302..4ce8fc6d3f2e4374bcb91a8f30b9f91787f607f7 100644 (file)
@@ -244,7 +244,7 @@ static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode,
        char *user, *pass;      
        user=buf;
        
-       pass=memchr(buf,' ',length);
+       pass = memchr(buf, ' ', length);
        if (!pass) {
                DEBUG(2, ("Password not found. Denying access\n"));
                mux_printf(mux_id, "ERR\n");
@@ -367,7 +367,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
        TALLOC_CTX *mem_ctx;
 
        if (*private) {
-               state = *private;
+               state = (struct gensec_ntlm_state *)*private;
        } else {
                state = talloc_zero(NULL, struct gensec_ntlm_state);
                if (!state) {