r19416: Fix some c++ warnings.

Guenther
(This used to be commit b076c39b6ac87a078feae30a4384c881c46e81ac)

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 02897265e25dead3e7afd2b805799acc80f02060..14b5285e45abaaaecc788b5c17073c6487dfab7c 100644 (file)
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -216,7 +216,7 @@ static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context,
                return ret;
        }
        
-       ret = krb5_string_to_key_salt(context, enctype, password->data, salt, key);
+       ret = krb5_string_to_key_salt(context, enctype, (const char *)password->data, salt, key);
        krb5_free_salt(context, salt);
        return ret;
 }
@@ -735,7 +735,7 @@ failed:
        static krb5_data kdata;
 
        kdata.data = (char *)krb5_principal_get_comp_string(context, principal, i);
-       kdata.length = strlen(kdata.data);
+       kdata.length = strlen((const char *)kdata.data);
        return &kdata;
 }
 #endif

diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 00cf2f62130279e00d62c8cdfe430834c78acfed..b768089fff576fcedb0ed776f76cfcca6689a48c 100644 (file)
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -215,7 +215,7 @@ static int net_lookup_kdc(int argc, const char **argv)
                realm.length = strlen(argv[0]);
        } else if (lp_realm() && *lp_realm()) {
                realm.data = lp_realm();
-               realm.length = strlen(realm.data);
+               realm.length = strlen((const char *)realm.data);
        } else {
                rc = krb5_get_host_realm(ctx, NULL, &realms);
                if (rc) {
@@ -224,7 +224,7 @@ static int net_lookup_kdc(int argc, const char **argv)
                        return -1;
                }
                realm.data = (char *) *realms;
-               realm.length = strlen(realm.data);
+               realm.length = strlen((const char *)realm.data);
        }
 
        rc = krb5_locate_kdc(ctx, &realm, (struct sockaddr **)(void *)&addrs, &num_kdcs, 0);