svn rev #23530: trunk/src/lib/krb5/ krb/ os/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23530
Commit By: ghudson
Log Message:
Move krb5_get_profile back to init_os_ctx.c for now and revert r23519.
At this time we link t_etypes against init_ctx.so during "make check",
which breaks if init_ctx contains reference to the profile library.
More general solutions to this problem are under discussion.



Changed Files:
U   trunk/src/lib/krb5/krb/Makefile.in
U   trunk/src/lib/krb5/krb/init_ctx.c
U   trunk/src/lib/krb5/os/Makefile.in
U   trunk/src/lib/krb5/os/init_os_ctx.c
Modified: trunk/src/lib/krb5/krb/Makefile.in
===================================================================
--- trunk/src/lib/krb5/krb/Makefile.in	2009-12-28 18:14:40 UTC (rev 23529)
+++ trunk/src/lib/krb5/krb/Makefile.in	2009-12-28 19:25:09 UTC (rev 23530)
@@ -3,7 +3,7 @@
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-LOCALINCLUDES = -I$(srcdir)/../os -I$(top_srcdir) -I$(top_srcdir)/util/profile
+LOCALINCLUDES = -I$(srcdir)/../os -I$(top_srcdir)
 DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\"
 
 ##DOS##BUILDTOP = ..\..\..

Modified: trunk/src/lib/krb5/krb/init_ctx.c
===================================================================
--- trunk/src/lib/krb5/krb/init_ctx.c	2009-12-28 18:14:40 UTC (rev 23529)
+++ trunk/src/lib/krb5/krb/init_ctx.c	2009-12-28 19:25:09 UTC (rev 23530)
@@ -54,7 +54,6 @@
  */
 
 #include "k5-int.h"
-#include "prof_int.h"        /* XXX for profile_copy, not public yet */
 #include <ctype.h>
 #include "brand.c"
 /* There has to be a better way for windows... */
@@ -648,9 +647,3 @@
     }
     return ret;
 }
-
-krb5_error_code KRB5_CALLCONV
-krb5_get_profile (krb5_context ctx, profile_t *profile)
-{
-    return profile_copy (ctx->profile, profile);
-}

Modified: trunk/src/lib/krb5/os/Makefile.in
===================================================================
--- trunk/src/lib/krb5/os/Makefile.in	2009-12-28 18:14:40 UTC (rev 23529)
+++ trunk/src/lib/krb5/os/Makefile.in	2009-12-28 19:25:09 UTC (rev 23530)
@@ -5,6 +5,7 @@
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\"
+LOCALINCLUDES=-I$(top_srcdir)/util/profile
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=os

Modified: trunk/src/lib/krb5/os/init_os_ctx.c
===================================================================
--- trunk/src/lib/krb5/os/init_os_ctx.c	2009-12-28 18:14:40 UTC (rev 23529)
+++ trunk/src/lib/krb5/os/init_os_ctx.c	2009-12-28 19:25:09 UTC (rev 23530)
@@ -31,6 +31,7 @@
 
 #include "k5-int.h"
 #include "os-proto.h"
+#include "prof_int.h"        /* XXX for profile_copy, not public yet */
 
 #ifdef USE_KIM
 #include "kim_library_private.h"
@@ -401,6 +402,12 @@
     return retval;
 }
 
+krb5_error_code KRB5_CALLCONV
+krb5_get_profile (krb5_context ctx, profile_t *profile)
+{
+    return profile_copy (ctx->profile, profile);
+}
+
 krb5_error_code
 krb5_set_config_files(krb5_context ctx, const char **filenames)
 {