diff options
| -rw-r--r-- | src/krb524/ChangeLog | 6 | ||||
| -rw-r--r-- | src/krb524/Makefile.in | 9 | ||||
| -rw-r--r-- | src/krb524/krb524.c | 45 |
3 files changed, 56 insertions, 4 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index cd2344221c..62be295315 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,9 @@ +2003-06-05 Tom Yu <tlyu@mit.edu> + + * Makefile.in: Build krb524.dll on Windows. + + * krb524.c: New file; stub for Windows krb524.dll. + 2003-06-05 Ken Raeburn <raeburn@mit.edu> * k524init.c (main): Remove debugging printf. diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index 41f8ef941a..3de36c8187 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -47,7 +47,8 @@ LOCALINCLUDES= $(KRB4_INCLUDES) -I. -I$(srcdir) SRCS = \ $(srcdir)/conv_princ.c \ $(srcdir)/cnv_tkt_skey.c \ - $(srcdir)/libinit.c + $(srcdir)/libinit.c \ + $(srcdir)/krb524.c EXTRADEPSRCS = \ $(srcdir)/test.c \ @@ -68,7 +69,7 @@ EXTRADEPSRCS = \ all-unix:: krb524d krb524test k524init -all-windows:: $(OUTPRE)k524init.exe # $(K524LIB) +all-windows:: $(OUTPRE)k524init.exe $(K524LIB) krb524test: test.o $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(CC_LINK) -o krb524test test.o $(KRB5_LIB) $(KRB4COMPAT_LIBS) @@ -82,7 +83,7 @@ krb524d: $(SERVER_OBJS) $(KADMSRV_DEPLIBS) $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) k524init: $(CLIENT_OBJS) $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(CC_LINK) -o k524init $(CLIENT_OBJS) $(KRB5_LIB) $(KRB4COMPAT_LIBS) -$(K524LIB): $(STLIBOBJS) $(K4LIB) $(KLIB) +$(K524LIB): $(OUTPRE)krb524.$(OBJEXT) $(OUTPRE)libinit.$(OBJEXT) $(KLIB) $(CLIB) link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS) $(OUTPRE)k524init.exe: $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(CLIB) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib @@ -137,4 +138,4 @@ $(OUTPRE)krb524d.$(OBJEXT): krb524d.c $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ krb524d.h - +$(OUTPRE)krb524.$(OBJEXT): krb524.c $(BUILDTOP)/include/krb5.h diff --git a/src/krb524/krb524.c b/src/krb524/krb524.c new file mode 100644 index 0000000000..1522b76dce --- /dev/null +++ b/src/krb524/krb524.c @@ -0,0 +1,45 @@ +/* + * Copyright 1994 by OpenVision Technologies, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appears in all copies and + * that both that copyright notice and this permission notice appear in + * supporting documentation, and that the name of OpenVision not be used + * in advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. OpenVision makes no + * representations about the suitability of this software for any + * purpose. It is provided "as is" without express or implied warranty. + * + * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef _WIN32 +#include "krb5.h" + +#ifdef krb524_convert_creds_kdc +#undef krb524_convert_creds_kdc +#endif +#ifdef krb524_init_ets +#undef krb524_init_ets +#endif + +int KRB5_CALLCONV +krb524_convert_creds_kdc(krb5_context context, krb5_creds *v5creds, struct credentials *v4creds) +{ + return(krb5_524_convert_creds(context,v5creds,v4creds)); +} + +void KRB5_CALLCONV +krb524_init_ets(void) +{ + /* no-op */ +} +#endif /* _WIN32 */ + |