summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-06-21 19:10:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:00 -0500
commit5a889c9d7bd3d66d6bbb5d31eb320f2e2f555d60 (patch)
treed0408d066b09e1880179666a2ce873a9cc2cf2eb
parent48a6e9fd76a9af9fb459a66d0d1d895f412b7653 (diff)
downloadsamba-5a889c9d7bd3d66d6bbb5d31eb320f2e2f555d60.tar.gz
samba-5a889c9d7bd3d66d6bbb5d31eb320f2e2f555d60.tar.bz2
samba-5a889c9d7bd3d66d6bbb5d31eb320f2e2f555d60.zip
r1214: Now compiles. Changed krb5_kt_free_entry to krb5_free_keytab_entry_contents
Jeremy. (This used to be commit be8a2dc00dd876c4b596600ae72d4ac05f9ebe64)
-rw-r--r--source3/libads/kerberos_keytab.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 605c7e1b1a..dc25fb74c0 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -154,7 +154,7 @@ int ads_keytab_add_entry(const char *srvPrinc, ADS_STRUCT *ads)
#else
compare_ok = ((strcmp(ktprinc, princ_s) == 0) && (kt_entry.vno != kvno - 1));
#endif
- krb5_free_unparsed_name(ktprinc);
+ krb5_free_unparsed_name(context, ktprinc);
ktprinc = NULL;
if (compare_ok) {
@@ -179,7 +179,7 @@ int ads_keytab_add_entry(const char *srvPrinc, ADS_STRUCT *ads)
error_message(ret)));
goto out;
}
- ret = krb5_kt_free_entry(context, &kt_entry);
+ ret = krb5_free_keytab_entry_contents(context, &kt_entry);
ZERO_STRUCT(kt_entry);
if (ret) {
DEBUG(1,("ads_keytab_add_entry: krb5_kt_remove_entry failed (%s)\n",
@@ -190,10 +190,10 @@ int ads_keytab_add_entry(const char *srvPrinc, ADS_STRUCT *ads)
}
/* Not a match, just free this entry and continue. */
- ret = krb5_kt_free_entry(context, &kt_entry);
+ ret = krb5_free_keytab_entry_contents(context, &kt_entry);
ZERO_STRUCT(kt_entry);
if (ret) {
- DEBUG(1,("ads_keytab_add_entry: krb5_kt_free_entry failed (%s)\n", error_message(ret)));
+ DEBUG(1,("ads_keytab_add_entry: krb5_free_keytab_entry_contents failed (%s)\n", error_message(ret)));
goto out;
}
}
@@ -269,7 +269,7 @@ out:
krb5_keytab_entry zero_kt_entry;
ZERO_STRUCT(zero_kt_entry);
if (memcmp(&zero_kt_entry, &kt_entry, sizeof(krb5_keytab_entry))) {
- krb5_kt_free_entry(context, &kt_entry);
+ krb5_free_keytab_entry_contents(context, &kt_entry);
}
}
if (princ) {
@@ -359,7 +359,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
DEBUG(1,("ads_keytab_flush: krb5_kt_start_seq failed (%s)\n",error_message(ret)));
goto out;
}
- ret = krb5_kt_free_entry(context, &kt_entry);
+ ret = krb5_free_keytab_entry_contents(context, &kt_entry);
ZERO_STRUCT(kt_entry);
if (ret) {
DEBUG(1,("ads_keytab_flush: krb5_kt_remove_entry failed (%s)\n",error_message(ret)));
@@ -383,7 +383,7 @@ out:
krb5_keytab_entry zero_kt_entry;
ZERO_STRUCT(zero_kt_entry);
if (memcmp(&zero_kt_entry, &kt_entry, sizeof(krb5_keytab_entry))) {
- krb5_kt_free_entry(context, &kt_entry);
+ krb5_free_keytab_entry_contents(context, &kt_entry);
}
}
if (cursor && keytab) {
@@ -450,7 +450,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) {
- krb5_kt_free_entry(context, &kt_entry);
+ krb5_free_keytab_entry_contents(context, &kt_entry);
ZERO_STRUCT(kt_entry);
found++;
}
@@ -487,7 +487,7 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
ret = krb5_unparse_name(context, kt_entry.principal, &ktprinc);
if (ret) {
DEBUG(1,("krb5_unparse_name failed (%s)\n", error_message(ret)));
- goto out;
+ goto done;
}
/*
* From looking at the krb5 source they don't seem to take locale
@@ -508,12 +508,12 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
}
}
}
- krb5_kt_free_entry(context, &kt_entry);
+ krb5_free_keytab_entry_contents(context, &kt_entry);
ZERO_STRUCT(kt_entry);
}
for (i = 0; oldEntries[i]; i++) {
ret |= ads_keytab_add_entry(oldEntries[i], ads);
- krb5_free_unparsed_name(oldEntries[i]);
+ krb5_free_unparsed_name(context, oldEntries[i]);
}
krb5_kt_end_seq_get(context, keytab, &cursor);
}
@@ -527,7 +527,7 @@ done:
krb5_keytab_entry zero_kt_entry;
ZERO_STRUCT(zero_kt_entry);
if (memcmp(&zero_kt_entry, &kt_entry, sizeof(krb5_keytab_entry))) {
- krb5_kt_free_entry(context, &kt_entry);
+ krb5_free_keytab_entry_contents(context, &kt_entry);
}
}
if (cursor && keytab) {