diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-04 15:28:21 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-04 15:28:21 +0000 |
| commit | 5b7b7f4f01c2a90ece0080cde9a3dde1238f3788 (patch) | |
| tree | 7f6af1455b1c4957e099657ba7644874415e6a55 /src/lib/kadm5/str_conv.c | |
| parent | 86b9cba23d0f7ea4c4add8b2474a4fbeb067a82f (diff) | |
| download | krb5-5b7b7f4f01c2a90ece0080cde9a3dde1238f3788.zip krb5-5b7b7f4f01c2a90ece0080cde9a3dde1238f3788.tar.gz krb5-5b7b7f4f01c2a90ece0080cde9a3dde1238f3788.tar.bz2 | |
* logger.c (krb5_klog_init): Cleanup assignments in
conditionals. Ensure that if hostname is MAXHOSTNAMELEN, buffer is
\0 terminated.
* str_conv.c (krb5_string_to_keysalts, krb5_keysalt_iterate):
Clean up assignments in conditionals.
* admin.h: Move kadm5_free_name_list() to version 1 api as it is
present in the ovsec_glue layer.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13263 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5/str_conv.c')
| -rw-r--r-- | src/lib/kadm5/str_conv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c index 3bf36a1..99334e8 100644 --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c @@ -335,8 +335,9 @@ krb5_string_to_keysalts(string, tupleseps, ksaltseps, dups, ksaltp, nksaltp) len = (size_t) *nksaltp; /* Get new keysalt array */ - if (*ksaltp = (krb5_key_salt_tuple *) - malloc((len + 1) * sizeof(krb5_key_salt_tuple))) { + *ksaltp = (krb5_key_salt_tuple *) + malloc((len + 1) * sizeof(krb5_key_salt_tuple)); + if (*ksaltp) { /* Copy old keysalt if appropriate */ if (savep) { @@ -392,7 +393,8 @@ krb5_keysalt_iterate(ksaltlist, nksalt, ignoresalt, iterator, arg) i, scratch.ks_enctype, scratch.ks_salttype)) { - if (kret = (*iterator)(&scratch, arg)) + kret = (*iterator)(&scratch, arg); + if (kret) break; } } |