diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-17 09:20:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:34 -0500 |
| commit | e835621799647ee70630b389fb53d15b15d68355 (patch) | |
| tree | 429a4ab67cf53f2853ba93f4628b63cd5aac2b02 /source4/kdc | |
| parent | ccc65fb995154451537879b57b900b8b4e340bd2 (diff) | |
| download | samba-e835621799647ee70630b389fb53d15b15d68355.tar.gz samba-e835621799647ee70630b389fb53d15b15d68355.tar.bz2 samba-e835621799647ee70630b389fb53d15b15d68355.zip | |
r8520: fixed a pile of warnings from the build farm gcc -Wall output on
S390. This is an attempt to avoid the panic we're seeing in the
automatic builds.
The main fixes are:
- assumptions that sizeof(size_t) == sizeof(int), mostly in printf formats
- use of NULL format statements to perform dn searches.
- assumption that sizeof() returns an int
(This used to be commit a58ea6b3854973b694d2b1e22323ed7eb00e3a3f)
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/hdb-ldb.c | 9 | ||||
| -rw-r--r-- | source4/kdc/kdc.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index af93ea8f72..444382f2a0 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -360,12 +360,14 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db, } if (ret == 0) { + size_t num_keys = ent->keys.len; /* * create keys from unicodePwd */ ret = hdb_generate_key_set_password(context, salt_principal, - unicodePwd, - &ent->keys.val, &ent->keys.len); + unicodePwd, + &ent->keys.val, &num_keys); + ent->keys.len = num_keys; krb5_free_principal(context, salt_principal); } @@ -387,7 +389,8 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db, } else if (val->length < 16) { ent->keys.val = NULL; ent->keys.len = 0; - krb5_warnx(context, "ntPwdHash has invalid length: %d\n",val->length); + krb5_warnx(context, "ntPwdHash has invalid length: %d\n", + (int)val->length); } else { ret = krb5_data_alloc (&keyvalue, 16); if (ret) { diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 1540e0f4a1..810e6cf9ba 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -97,7 +97,7 @@ static void kdc_recv_handler(struct kdc_socket *kdc_socket) blob.length = nread; DEBUG(2,("Received krb5 packet of length %d from %s:%d\n", - blob.length, src_addr, src_port)); + (int)blob.length, src_addr, src_port)); /* TODO: This really should be in a utility function somewhere */ ZERO_STRUCT(src_sock_addr); |