r17584: Some C++ Warnings

(This used to be commit f6194cf4b263454bbdf180a7d014ffc3498df497)

diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c
index ec7264924cdaaf8848f5af6f7e99adedc706b953..70c906d942ac0229ef12b4dd7c6d73f7a3c2713b 100644 (file)
--- a/source3/auth/auth_script.c
+++ b/source3/auth/auth_script.c
@@ -69,7 +69,7 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co
                        48 + 1 + /* 24 bytes of challenge going to 48 */
                        48 + 1;
 
-       secret_str = malloc(secret_str_len);
+       secret_str = (char *)malloc(secret_str_len);
        if (!secret_str) {
                return NT_STATUS_NO_MEMORY;
        }

diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 3ce45e20714ab9f663500f1cd7c98a4587325d26..460360613ce4ca383a23577b233ac2e952b39c7f 100644 (file)
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -403,7 +403,7 @@ static BOOL test_misc(void)
        talloc_report(root, stdout);
 
 
-       p2 = talloc_zero_size(p1, 20);
+       p2 = (char *)talloc_zero_size(p1, 20);
        if (p2[19] != 0) {
                printf("Failed to give zero memory\n");
                return False;
@@ -465,7 +465,7 @@ static BOOL test_misc(void)
        talloc_unlink(NULL, p1);
 
        p1 = talloc_named_const(root, 10, "p1");
-       p2 = talloc_named_const(root, 20, "p2");
+       p2 = (char *)talloc_named_const(root, 20, "p2");
        talloc_reference(p1, p2);
        talloc_report_full(root, stdout);
        talloc_unlink(root, p2);
@@ -477,7 +477,7 @@ static BOOL test_misc(void)
        talloc_unlink(root, p1);
 
        p1 = talloc_named_const(root, 10, "p1");
-       p2 = talloc_named_const(root, 20, "p2");
+       p2 = (char *)talloc_named_const(root, 20, "p2");
        talloc_reference(NULL, p2);
        talloc_report_full(root, stdout);
        talloc_unlink(root, p2);

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 1aef5c6c4a228562b5ccd1238a1e38b56d4c07d7..f2dacf241ec2c2342e19a575bc15d3a0af10a917 100644 (file)
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -1036,7 +1036,7 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
        case 0:
                pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (const void **)&tmp);
                if (tmp != NULL) {
-                       retval = atoi(tmp);
+                       retval = atoi((const char *)tmp);
                        switch (retval) {
                        case PAM_AUTHTOK_EXPIRED:
                                /* fall through, since new token is required in this case */

diff --git a/source3/sam/idmap_rid.c b/source3/sam/idmap_rid.c
index 23496d696922e12934211b50219dd9236450542c..63167accf39183fc246f49ffb0000d757c6c6717 100644 (file)
--- a/source3/sam/idmap_rid.c
+++ b/source3/sam/idmap_rid.c
@@ -196,9 +196,9 @@ static NTSTATUS rid_idmap_get_domains(uint32 *num_domains, fstring **domain_name
        }
 
        /* open a connection to the dc */
-       username = secrets_fetch(SECRETS_AUTH_USER, NULL);
-       password = secrets_fetch(SECRETS_AUTH_PASSWORD, NULL);
-       domain =   secrets_fetch(SECRETS_AUTH_DOMAIN, NULL);
+       username = (char *)secrets_fetch(SECRETS_AUTH_USER, NULL);
+       password = (char *)secrets_fetch(SECRETS_AUTH_PASSWORD, NULL);
+       domain =   (char *)secrets_fetch(SECRETS_AUTH_DOMAIN, NULL);
 
        if (username) {
 

diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 24412cbe85e23d353d633925e0cb5754d3a127ee..aa68cf09c9606b95eb8f6dcf1956be911f6c1a9b 100644 (file)
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -142,7 +142,7 @@ void print_netbios_packet(FILE *out, unsigned char *data, long length, long actu
        long newlen;
        
        newlen = length+sizeof(HDR_IP)+sizeof(HDR_TCP);
-       newdata = malloc(newlen);
+       newdata = (unsigned char *)malloc(newlen);
 
        HDR_IP.packet_length = htons(newlen);
        HDR_TCP.window = htons(0x2000);
@@ -165,7 +165,7 @@ void read_log_msg(FILE *in, unsigned char **_buffer, long *buffersize, long *dat
        int tmp; long i;
        assert(fscanf(in, " size=%ld\n", buffersize));
        *buffersize+=4; /* for netbios */
-       buffer = malloc(*buffersize);
+       buffer = (unsigned char *)malloc(*buffersize);
        memset(buffer, 0, *buffersize);
        /* NetBIOS */
        buffer[0] = 0x00;