r23650: Fix remaining callers of krb5_kt_default().

Guenther

diff --git a/source/libads/kerberos_keytab.c b/source/libads/kerberos_keytab.c
index d86b902ad52fd4bb4cf386c80c17e4daa55fecdc..7847b689c2f03b0aba3734ea72ad64b57aeb4ab5 100644 (file)
--- a/source/libads/kerberos_keytab.c
+++ b/source/libads/kerberos_keytab.c
@@ -546,10 +546,11 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
                DEBUG(1,("ads_keytab_create_default: could not krb5_init_context: %s\n",error_message(ret)));
                return ret;
        }
-       ret = krb5_kt_default(context, &keytab);
+
+       ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
        if (ret) {
-               DEBUG(1,("ads_keytab_create_default: krb5_kt_default failed (%s)\n",error_message(ret)));
-               goto done;
+               DEBUG(1,("ads_keytab_create_default: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+               goto out;
        }
 
        ret = krb5_kt_start_seq_get(context, keytab, &cursor);

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index 5836fc34e033d1b03ea4de6c4ef7a256628067c5..82796d39ccd329eba3fca7a38c30cfb69e81525e 100644 (file)
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -951,10 +951,10 @@ get_key_from_keytab(krb5_context context,
           may be in the middle of a keytab enumeration when this is
           called. JRA. */
 
-       ret = krb5_kt_default(context, &keytab);
+       ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
        if (ret) {
-               DEBUG(0,("get_key_from_keytab: failed to open keytab: %s\n", error_message(ret)));
-               return ret;
+               DEBUG(1,("get_key_from_keytab: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+               goto out;
        }
 
        if ( DEBUGLEVEL >= 10 ) {