diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-12-28 19:25:09 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-12-28 19:25:09 +0000 |
| commit | 635ee3a9cd28c7af0a0b7cf43a292ae7255c9a2b (patch) | |
| tree | 2a9707023517d29c6caac7ec514a8c9a1e31905e | |
| parent | 92516277cb0205a1781b06d204d9d103d599f8a7 (diff) | |
| download | krb5-635ee3a9cd28c7af0a0b7cf43a292ae7255c9a2b.tar.gz krb5-635ee3a9cd28c7af0a0b7cf43a292ae7255c9a2b.tar.xz krb5-635ee3a9cd28c7af0a0b7cf43a292ae7255c9a2b.zip | |
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.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23530 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/init_ctx.c | 7 | ||||
| -rw-r--r-- | src/lib/krb5/os/Makefile.in | 1 | ||||
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index c5dc49adc0..507be6e805 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -3,7 +3,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. 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 = ..\..\.. diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index c5c29ca3ec..6ffee90bb7 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -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 @@ errout: } return ret; } - -krb5_error_code KRB5_CALLCONV -krb5_get_profile (krb5_context ctx, profile_t *profile) -{ - return profile_copy (ctx->profile, profile); -} diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 215d390149..5a81302370 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -5,6 +5,7 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) DEFS= DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" +LOCALINCLUDES=-I$(top_srcdir)/util/profile ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=os diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 70841a42f0..7f2110f8e4 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -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 @@ krb5_os_init_context(krb5_context ctx, krb5_boolean kdc) 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) { |