summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-10-19 21:47:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:33 -0500
commita2dfdfbf86e51273713f2082ce92831f7fcec455 (patch)
treec5e1486ee2d3a6412fa73d362d9f945940211d18 /source3
parent1e86361080ed7d7b4f74dd962ea0c060f1d4e6f9 (diff)
downloadsamba-a2dfdfbf86e51273713f2082ce92831f7fcec455.tar.gz
samba-a2dfdfbf86e51273713f2082ce92831f7fcec455.tar.bz2
samba-a2dfdfbf86e51273713f2082ce92831f7fcec455.zip
r19416: Fix some c++ warnings.
Guenther (This used to be commit b076c39b6ac87a078feae30a4384c881c46e81ac)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/clikrb5.c4
-rw-r--r--source3/utils/net_lookup.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 02897265e2..14b5285e45 100644
--- 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 00cf2f6213..b768089fff 100644
--- 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);