From: Zhanna Tsitkov <tsitkova@mit.edu>
Date: Tue, 14 Aug 2012 14:28:46 +0000 (-0400)
Subject: Remove obsolete function krb5_secure_config_files
X-Git-Tag: krb5-1.11-alpha1~323
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5861635b1b52fb969f3251fe66730b6f636b6d9;p=thirdparty%2Fkrb5.git

Remove obsolete function krb5_secure_config_files
---

diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 3f2716a2fa..1591b35667 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -513,7 +513,6 @@ krb5_recvauth
 krb5_recvauth_version
 krb5_register_serializer
 krb5_salttype_to_string
-krb5_secure_config_files
 krb5_sendauth
 krb5_sendto_kdc
 krb5_ser_address_init
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index 7cded7ce52..c4bf3019cf 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -497,29 +497,6 @@ krb5_free_config_files(char **filenames)
     free_filespecs(filenames);
 }
 
-
-krb5_error_code
-krb5_secure_config_files(krb5_context ctx)
-{
-    /* Obsolete interface; always return an error.
-     *  This function should be removed next time a major version
-     *  number change happens.
-     */
-    krb5_error_code retval = 0;
-
-    if (ctx->profile) {
-        profile_release(ctx->profile);
-        ctx->profile = 0;
-    }
-
-    ctx->profile_secure = TRUE;
-    retval = os_init_paths(ctx, FALSE);
-    if (retval)
-        return retval;
-
-    return KRB5_OBSOLETE_FN;
-}
-
 void
 krb5_os_free_context(krb5_context ctx)
 {
diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h
index ec97545523..a0fa37e3d6 100644
--- a/src/lib/krb5/os/os-proto.h
+++ b/src/lib/krb5/os/os-proto.h
@@ -81,9 +81,6 @@ krb5_error_code krb5_make_full_ipaddr(krb5_context,
 krb5_error_code krb5_try_realm_txt_rr(const char *, const char *,
                                       char **realm);
 
-/* Obsolete interface - leave prototype here until code removed */
-krb5_error_code krb5_secure_config_files(krb5_context ctx);
-
 void krb5int_debug_fprint (const char *fmt, ...);
 
 int _krb5_use_dns_realm (krb5_context);