From f4b6820c5c0df92f29cc6f75cef0d16562c8e1e6 Mon Sep 17 00:00:00 2001 From: Danilo Almeida Date: Wed, 16 Jun 1999 05:38:37 +0000 Subject: [PATCH] Fix windows build. Fix calling convention. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11515 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/keytab/srvtab/ChangeLog | 15 ++++++++++++++- src/lib/krb5/keytab/srvtab/Makefile.in | 4 +--- src/lib/krb5/keytab/srvtab/kts_close.c | 2 +- src/lib/krb5/keytab/srvtab/kts_endget.c | 2 +- src/lib/krb5/keytab/srvtab/kts_g_ent.c | 2 +- src/lib/krb5/keytab/srvtab/kts_g_name.c | 2 +- src/lib/krb5/keytab/srvtab/kts_next.c | 2 +- src/lib/krb5/keytab/srvtab/kts_resolv.c | 2 +- src/lib/krb5/keytab/srvtab/kts_ssget.c | 2 +- src/lib/krb5/keytab/srvtab/ktsrvtab.h | 14 +++++++------- 10 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog index 678056252..5c55de820 100644 --- a/src/lib/krb5/keytab/srvtab/ChangeLog +++ b/src/lib/krb5/keytab/srvtab/ChangeLog @@ -1,4 +1,17 @@ +1999-06-15 Danilo Almeida + + * Makefile.in: Fix windows build. + + * ktsrvtab.h, kts_resolv.c (krb5_ktsrvtab_resolve), + kts_g_name.c (krb5_ktsrvtab_get_name), + kts_close.c (krb5_ktsrvtab_close), + kts_g_ent.c (krb5_ktsrvtab_get_entry), + kts_ssget.c (krb5_ktsrvtab_start_seq_get), + kts_next.c (krb5_ktsrvtab_get_next), + kts_endget.c (krb5_ktsrvtab_end_get): Fix calling convention. + + 1999-06-13 Geoffrey King * Initial checkin of ghudson's code to implement the SRVTAB keytab - type, which can read a krb4 srvtab. \ No newline at end of file + type, which can read a krb4 srvtab. diff --git a/src/lib/krb5/keytab/srvtab/Makefile.in b/src/lib/krb5/keytab/srvtab/Makefile.in index 5ac97f551..001050cd1 100644 --- a/src/lib/krb5/keytab/srvtab/Makefile.in +++ b/src/lib/krb5/keytab/srvtab/Makefile.in @@ -7,7 +7,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. ##DOS##PREFIXDIR=keytab\srvtab -##DOS##OBJFILE=$(OUTPRE)file.lst +##DOS##OBJFILE=$(OUTPRE)srvtab.lst ##WIN16##LIBNAME=..\..\krb5.lib STLIBOBJS= \ @@ -44,8 +44,6 @@ SRCS= \ $(srcdir)/kts_ssget.c \ $(srcdir)/kts_util.c -all-windows:: subdirs $(OBJFILE) - ##DOS##LIBOBJS = $(OBJS) all-unix:: all-libobjs diff --git a/src/lib/krb5/keytab/srvtab/kts_close.c b/src/lib/krb5/keytab/srvtab/kts_close.c index 091444028..1d66d7ed5 100644 --- a/src/lib/krb5/keytab/srvtab/kts_close.c +++ b/src/lib/krb5/keytab/srvtab/kts_close.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_close(context, id) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/srvtab/kts_endget.c b/src/lib/krb5/keytab/srvtab/kts_endget.c index c58dc543e..035e9c51d 100644 --- a/src/lib/krb5/keytab/srvtab/kts_endget.c +++ b/src/lib/krb5/keytab/srvtab/kts_endget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_end_get(context, id, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/srvtab/kts_g_ent.c b/src/lib/krb5/keytab/srvtab/kts_g_ent.c index ac3e9487d..01a0379ba 100644 --- a/src/lib/krb5/keytab/srvtab/kts_g_ent.c +++ b/src/lib/krb5/keytab/srvtab/kts_g_ent.c @@ -29,7 +29,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_entry(context, id, principal, kvno, enctype, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/srvtab/kts_g_name.c b/src/lib/krb5/keytab/srvtab/kts_g_name.c index 4bc759abb..74555600c 100644 --- a/src/lib/krb5/keytab/srvtab/kts_g_name.c +++ b/src/lib/krb5/keytab/srvtab/kts_g_name.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_name(context, id, name, len) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/srvtab/kts_next.c b/src/lib/krb5/keytab/srvtab/kts_next.c index db1b9a931..275e738d8 100644 --- a/src/lib/krb5/keytab/srvtab/kts_next.c +++ b/src/lib/krb5/keytab/srvtab/kts_next.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_next(context, id, entry, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/srvtab/kts_resolv.c b/src/lib/krb5/keytab/srvtab/kts_resolv.c index 76009bc19..795a82887 100644 --- a/src/lib/krb5/keytab/srvtab/kts_resolv.c +++ b/src/lib/krb5/keytab/srvtab/kts_resolv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_resolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/srvtab/kts_ssget.c b/src/lib/krb5/keytab/srvtab/kts_ssget.c index 21b88ccc0..edb252264 100644 --- a/src/lib/krb5/keytab/srvtab/kts_ssget.c +++ b/src/lib/krb5/keytab/srvtab/kts_ssget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktsrvtab.h" -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_start_seq_get(context, id, cursorp) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/srvtab/ktsrvtab.h b/src/lib/krb5/keytab/srvtab/ktsrvtab.h index 4c274e0ae..071a27d10 100644 --- a/src/lib/krb5/keytab/srvtab/ktsrvtab.h +++ b/src/lib/krb5/keytab/srvtab/ktsrvtab.h @@ -59,22 +59,22 @@ typedef struct _krb5_ktsrvtab_data { extern struct _krb5_kt_ops krb5_kts_ops; -krb5_error_code krb5_ktsrvtab_resolve +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_resolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code krb5_ktsrvtab_get_name +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_name PROTOTYPE((krb5_context, krb5_keytab, char *, int)); -krb5_error_code krb5_ktsrvtab_close +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_close PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code krb5_ktsrvtab_get_entry +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_principal, @@ -82,18 +82,18 @@ krb5_error_code krb5_ktsrvtab_get_entry krb5_enctype, krb5_keytab_entry *)); -krb5_error_code krb5_ktsrvtab_start_seq_get +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_start_seq_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); -krb5_error_code krb5_ktsrvtab_get_next +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_next PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *, krb5_kt_cursor *)); -krb5_error_code krb5_ktsrvtab_end_get +krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_end_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); -- 2.26.2