mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
r19416: Fix some c++ warnings.
Guenther
This commit is contained in:
parent
bdd2e0361c
commit
b076c39b6a
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user