summaryrefslogtreecommitdiffstats
path: root/source/libads
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-07-06 23:42:58 +0000
committerJeremy Allison <jra@samba.org>2004-07-06 23:42:58 +0000
commit14924ce5a1507022f721289004e50d069086d03c (patch)
tree0cd022e9c5557682178b42e5807de6f0445e14ac /source/libads
parentd4e4c9593414bc43590868ba7c2eca2998140108 (diff)
downloadsamba-14924ce5a1507022f721289004e50d069086d03c.tar.gz
samba-14924ce5a1507022f721289004e50d069086d03c.tar.xz
samba-14924ce5a1507022f721289004e50d069086d03c.zip
r1373: Fix from Guenther Deschner <gd@sernet.de> to ensure last error return is not invalid.
Jeremy.
Diffstat (limited to 'source/libads')
-rw-r--r--source/libads/kerberos_keytab.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/libads/kerberos_keytab.c b/source/libads/kerberos_keytab.c
index 95152016b85..eec5f104fd9 100644
--- a/source/libads/kerberos_keytab.c
+++ b/source/libads/kerberos_keytab.c
@@ -479,7 +479,7 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if (ret != KRB5_KT_END && ret != ENOENT ) {
- while ((ret = krb5_kt_next_entry(context, keytab, &kt_entry, &cursor)) == 0) {
+ while (krb5_kt_next_entry(context, keytab, &kt_entry, &cursor) == 0) {
if (kt_entry.vno != kvno) {
char *ktprinc = NULL;
char *p;
@@ -516,6 +516,7 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
smb_krb5_kt_free_entry(context, &kt_entry);
ZERO_STRUCT(kt_entry);
}
+ ret = 0;
for (i = 0; oldEntries[i]; i++) {
ret |= ads_keytab_add_entry(ads, oldEntries[i]);
krb5_free_unparsed_name(context, oldEntries[i]);