From: Tom Yu <tlyu@mit.edu>
Date: Tue, 18 Oct 2011 21:07:23 +0000 (+0000)
Subject: pull up r24828 from trunk
X-Git-Tag: krb5-1.9.2-beta1~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=638b2e762fa4074b91731f380ea679cbdf26eac1;p=krb5.git

pull up r24828 from trunk

 ------------------------------------------------------------------------
 r24828 | raeburn | 2011-04-03 17:54:32 -0400 (Sun, 03 Apr 2011) | 2 lines

 Include krb5_libinit.h always, since we call krb5int_initialize_library always.

ticket: 6960
version_fixed: 1.9.2
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@25381 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 6cff4bcae..1d70d1b70 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -57,10 +57,7 @@
 #include "int-proto.h"
 #include <ctype.h>
 #include "brand.c"
-/* There has to be a better way for windows... */
-#if defined(unix) || TARGET_OS_MAC
 #include "../krb5_libinit.h"
-#endif
 
 /* The des-mdX entries are last for now, because it's easy to
    configure KDCs to issue TGTs with des-mdX keys and then not accept