From c4641b0636aa2f7dd109ef6ce85210692058fa49 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Thu, 25 Jul 1996 06:16:18 +0000 Subject: [PATCH] util_ordering.c (g_order_check): util_ordering.c (g_order_init): Changed return code to be an int 32, since we return a com_err error code. Change the type of the sequence number to be an uint32. gssapi.h: Define gss_int32 -- needed for error code returns. Makefile.in (EHDRDIR): Use $(S) instead of /, so that EHDRDIR is valid under windows. Fix how the header file is copied in under Windows. gssapiP_generic.h: Include gssapi_generic.h instead of gssapi.h, so that we get the definitions of the nametype oids. oid_ops.c (generic_gss_release_oid): Re-enable function. util_token.c (g_verify_token_header): Changed return code to be an int 32, since we return a com_err error code. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8814 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/generic/ChangeLog | 20 +++++++++++++++++++- src/lib/gssapi/generic/Makefile.in | 6 ++++-- src/lib/gssapi/generic/gssapi.h | 3 +++ src/lib/gssapi/generic/gssapiP_generic.h | 13 +++++++++---- src/lib/gssapi/generic/gssapi_generic.h | 8 ++++---- src/lib/gssapi/generic/oid_ops.c | 2 -- src/lib/gssapi/generic/util_ordering.c | 8 ++++---- src/lib/gssapi/generic/util_token.c | 2 +- 8 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index ef8a6711f..1c0dd47cb 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,7 +1,25 @@ +Thu Jul 25 00:03:01 1996 Theodore Y. Ts'o + + * util_ordering.c (g_order_check): + * util_ordering.c (g_order_init): Changed return code to be an int + 32, since we return a com_err error code. Change the type + of the sequence number to be an uint32. + + * gssapi.h: Define gss_int32 -- needed for error code returns. + + * Makefile.in (EHDRDIR): Use $(S) instead of /, so that EHDRDIR is + valid under windows. Fix how the header file is copied in + under Windows. + + * gssapiP_generic.h: Include gssapi_generic.h instead of gssapi.h, + so that we get the definitions of the nametype oids. + Wed Jul 24 18:48:43 1996 Theodore Y. Ts'o + * oid_ops.c (generic_gss_release_oid): Re-enable function. + * util_token.c (g_verify_token_header): Changed return code to be - an unsigned int 32, since we return a com_err error code. + an int 32, since we return a com_err error code. * rel_buffer.c (generic_gss_release_buffer): * rel_oid_set.c (generic_gss_release_oid_set): Remove INTERFACE diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index 1b9c6c491..bb84ed105 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -72,7 +72,7 @@ OBJS = \ util_validate.$(OBJEXT) \ gssapi_err_generic.$(OBJEXT) -EHDRDIR= $(BUILDTOP)/include/gssapi +EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi EXPORTED_HEADERS= gssapi.h gssapi_generic.h HDRS= $(ETHDRS) @@ -81,7 +81,9 @@ all-unix:: $(SRCS) $(HDRS) includes $(OBJS) all-mac:: $(SRCS) $(HDRS) includes $(OBJS) -all-windows:: $(SRCS) $(HDRS) includes $(OBJS) +all-windows:: win-include $(SRCS) $(HDRS) $(OBJS) + +win-include:: if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) copy gssapi.h $(EHDRDIR) copy gssapi_generic.h $(EHDRDIR) diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h index 28cc4ca41..c83e7e6a7 100644 --- a/src/lib/gssapi/generic/gssapi.h +++ b/src/lib/gssapi/generic/gssapi.h @@ -170,10 +170,13 @@ typedef void FAR * gss_ctx_id_t; */ #if (GSS_SIZEOF_SHORT == 4) typedef unsigned short gss_uint32; +typedef short gss_int32; #elif (GSS_SIZEOF_INT == 4) typedef unsigned int gss_uint32; +typedef int gss_int32; #elif (GSS_SIZEOF_LONG == 4) typedef unsigned long gss_uint32; +typedef long gss_int32; #endif #ifdef OM_STRING diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h index f2c060142..63bde2024 100644 --- a/src/lib/gssapi/generic/gssapiP_generic.h +++ b/src/lib/gssapi/generic/gssapiP_generic.h @@ -30,7 +30,7 @@ #if (defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH)) #include #endif -#include "gssapi.h" +#include "gssapi_generic.h" #include "gssapi_err_generic.h" #include @@ -121,7 +121,7 @@ int g_token_size PROTOTYPE((gss_OID mech, unsigned int body_size)); void g_make_token_header PROTOTYPE((gss_OID mech, int body_size, unsigned char **buf, int tok_type)); -gss_uint32 g_verify_token_header PROTOTYPE((gss_OID mech, int *body_size, +gss_int32 g_verify_token_header PROTOTYPE((gss_OID mech, int *body_size, unsigned char **buf, int tok_type, int toksize)); OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status, @@ -133,10 +133,10 @@ OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status, OM_uint32 status_value, gss_buffer_t status_string)); -OM_uint32 g_order_init PROTOTYPE((void **queue, unsigned int seqnum, +gss_int32 g_order_init PROTOTYPE((void **queue, OM_uint32 seqnum, int do_replay, int do_sequence)); -OM_uint32 g_order_check PROTOTYPE((void **queue, unsigned int seqnum)); +gss_int32 g_order_check PROTOTYPE((void **queue, OM_uint32 seqnum)); void g_order_free PROTOTYPE((void **queue)); @@ -157,6 +157,11 @@ PROTOTYPE((OM_uint32*, /* minor_status */ gss_OID_set* /* set */ )); +OM_uint32 generic_gss_release_oid +PROTOTYPE((OM_uint32*, /* minor_status */ + gss_OID* /* set */ + )); + OM_uint32 generic_gss_copy_oid PROTOTYPE( (OM_uint32 *, /* minor_status */ gss_OID, /* oid */ diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h index 88c054788..09a9810b0 100644 --- a/src/lib/gssapi/generic/gssapi_generic.h +++ b/src/lib/gssapi/generic/gssapi_generic.h @@ -33,9 +33,9 @@ #include #endif -extern const gss_OID_desc FAR * const gss_nt_user_name; -extern const gss_OID_desc FAR * const gss_nt_machine_uid_name; -extern const gss_OID_desc FAR * const gss_nt_string_uid_name; -extern const gss_OID_desc FAR * const gss_nt_service_name; +extern gss_OID gss_nt_user_name; +extern gss_OID gss_nt_machine_uid_name; +extern gss_OID gss_nt_string_uid_name; +extern gss_OID gss_nt_service_name; #endif /* _GSSAPI_GENERIC_H_ */ diff --git a/src/lib/gssapi/generic/oid_ops.c b/src/lib/gssapi/generic/oid_ops.c index 38d73f429..980e936b7 100644 --- a/src/lib/gssapi/generic/oid_ops.c +++ b/src/lib/gssapi/generic/oid_ops.c @@ -37,7 +37,6 @@ #include #include -#if 0 OM_uint32 generic_gss_release_oid(minor_status, oid) OM_uint32 *minor_status; @@ -67,7 +66,6 @@ generic_gss_release_oid(minor_status, oid) *oid = GSS_C_NO_OID; return(GSS_S_COMPLETE); } -#endif OM_uint32 generic_gss_copy_oid(minor_status, oid, new_oid) diff --git a/src/lib/gssapi/generic/util_ordering.c b/src/lib/gssapi/generic/util_ordering.c index 2a9e82bf2..34490779b 100644 --- a/src/lib/gssapi/generic/util_ordering.c +++ b/src/lib/gssapi/generic/util_ordering.c @@ -80,8 +80,8 @@ queue_insert(queue *q, int after, unsigned int seqnum) } } -OM_uint32 -g_order_init(void **vqueue, unsigned int seqnum, +gss_int32 +g_order_init(void **vqueue, OM_uint32 seqnum, int do_replay, int do_sequence) { queue *q; @@ -101,8 +101,8 @@ g_order_init(void **vqueue, unsigned int seqnum, return(0); } -OM_uint32 -g_order_check(void **vqueue, unsigned int seqnum) +gss_int32 +g_order_check(void **vqueue, OM_uint32 seqnum) { queue *q; int i; diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c index fe02c0e50..29d16e89a 100644 --- a/src/lib/gssapi/generic/util_token.c +++ b/src/lib/gssapi/generic/util_token.c @@ -159,7 +159,7 @@ void g_make_token_header(mech, body_size, buf, tok_type) * mechanism in the token does not match the mech argument. buf and * *body_size are left unmodified on error. */ -gss_uint32 g_verify_token_header(mech, body_size, buf_in, tok_type, toksize) +gss_int32 g_verify_token_header(mech, body_size, buf_in, tok_type, toksize) gss_OID mech; int *body_size; unsigned char **buf_in; -- 2.26.2