diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-04-24 09:36:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:15 -0500 |
| commit | c33f6b2c370379dfd010600adc59e7439f1318f7 (patch) | |
| tree | 2ac36b3751796f05ecb45a2ecd03bd166ed7182f /source4/heimdal/lib/hdb/keys.c | |
| parent | 0eddf14b307e905663b95296aa695a10d3fb90f7 (diff) | |
| download | samba-c33f6b2c370379dfd010600adc59e7439f1318f7.tar.gz samba-c33f6b2c370379dfd010600adc59e7439f1318f7.tar.bz2 samba-c33f6b2c370379dfd010600adc59e7439f1318f7.zip | |
r15192: Update Samba4 to use current lorikeet-heimdal.
Andrew Bartlett
(This used to be commit f0e538126c5cb29ca14ad0d8281eaa0a715ed94f)
Diffstat (limited to 'source4/heimdal/lib/hdb/keys.c')
| -rw-r--r-- | source4/heimdal/lib/hdb/keys.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/heimdal/lib/hdb/keys.c b/source4/heimdal/lib/hdb/keys.c index c5a2efd758..0ca3846f9d 100644 --- a/source4/heimdal/lib/hdb/keys.c +++ b/source4/heimdal/lib/hdb/keys.c @@ -33,7 +33,7 @@ #include "hdb_locl.h" -RCSID("$Id: keys.c,v 1.3 2005/03/17 00:42:05 lha Exp $"); +RCSID("$Id: keys.c,v 1.4 2006/04/02 00:45:48 lha Exp $"); /* * free all the memory used by (len, keys) @@ -298,6 +298,7 @@ hdb_generate_key_set(krb5_context context, krb5_principal principal, &enctypes, &num_enctypes, &salt, principal); if (ret) { krb5_warnx(context, "bad value for default_keys `%s'", *kp); + ret = 0; continue; } @@ -334,6 +335,8 @@ hdb_generate_key_set(krb5_context context, krb5_principal principal, krb5_free_salt(context, salt); } + *ret_key_set = key_set; + out: if (ret) { krb5_warn(context, ret, @@ -348,8 +351,6 @@ hdb_generate_key_set(krb5_context context, krb5_principal principal, ret = EINVAL; /* XXX */ } - *ret_key_set = key_set; - return ret; } |