Patch from kwc@citi.umich.edu to support

gss_krb5_export_lucid_sec_context and other facilities for NFSv4
implementations.

In order to apply this patch gss_krb5.h needs to be auto-generated so we can expose a 64-bit type for sequence numbers.

Ticket: 2587
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16423 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 49 insertions, 0 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index ec34f6b5a6..5c5c82ac01 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08  Sam Hartman  <hartmans@mit.edu>
+
+	* util_validate.c utl_nohash_validate.c gssapiP_generic.h:
+	Support for lucid context validation 
+
 2004-06-02  Ken Raeburn  <raeburn@mit.edu>
 
 	* disp_com_err_status.c (init_et): Variable deleted.
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index e297862fe9..0af65df1b5 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -111,12 +111,15 @@ typedef UINT64_TYPE gssint_uint64;
 #define	g_save_name		gssint_g_save_name
 #define	g_save_cred_id		gssint_g_save_cred_id
 #define	g_save_ctx_id		gssint_g_save_ctx_id
+#define	g_save_lucidctx_id	gssint_g_save_lucidctx_id
 #define	g_validate_name		gssint_g_validate_name
 #define	g_validate_cred_id	gssint_g_validate_cred_id
 #define	g_validate_ctx_id	gssint_g_validate_ctx_id
+#define	g_validate_lucidctx_id	gssint_g_validate_lucidctx_id
 #define	g_delete_name		gssint_g_delete_name
 #define	g_delete_cred_id	gssint_g_delete_cred_id
 #define	g_delete_ctx_id		gssint_g_delete_ctx_id
+#define	g_delete_lucidctx_id	gssint_g_delete_lucidctx_id
 #define	g_make_string_buffer	gssint_g_make_string_buffer
 #define	g_copy_OID_set		gssint_g_copy_OID_set
 #define	g_token_size		gssint_g_token_size
@@ -150,14 +153,17 @@ int g_set_entry_get (g_set_elt *s, void *key, void **value);
 int g_save_name (g_set *vdb, gss_name_t *name);
 int g_save_cred_id (g_set *vdb, gss_cred_id_t *cred);
 int g_save_ctx_id (g_set *vdb, gss_ctx_id_t *ctx);
+int g_save_lucidctx_id (g_set *vdb, void *lctx);
 
 int g_validate_name (g_set *vdb, gss_name_t *name);
 int g_validate_cred_id (g_set *vdb, gss_cred_id_t *cred);
 int g_validate_ctx_id (g_set *vdb, gss_ctx_id_t *ctx);
+int g_validate_lucidctx_id (g_set *vdb, void *lctx);
 
 int g_delete_name (g_set *vdb, gss_name_t *name);
 int g_delete_cred_id (g_set *vdb, gss_cred_id_t *cred);
 int g_delete_ctx_id (g_set *vdb, gss_ctx_id_t *ctx);
+int g_delete_lucidctx_id (g_set *vdb, void *lctx);
 
 int g_make_string_buffer (const char *str, gss_buffer_t buffer);
 
diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c
index 779260892e..fffacabcb3 100644
--- a/src/lib/gssapi/generic/util_validate.c
+++ b/src/lib/gssapi/generic/util_validate.c
@@ -52,6 +52,7 @@ typedef struct _vkey {
 #define V_NAME		1
 #define V_CRED_ID	2
 #define V_CTX_ID	3
+#define V_LCTX_ID	4
 
 /* All these functions return 0 on failure, and non-zero on success */
 
@@ -249,6 +250,13 @@ int g_save_ctx_id(vdb, ctx)
 {
    return(g_save(vdb, V_CTX_ID, (void *) ctx));
 }
+int g_save_lucidctx_id(vdb, lctx)
+     g_set *vdb;
+     void *lctx;
+{
+   return(g_save(vdb, V_LCTX_ID, (void *) lctx));
+}
+
 
 /* validate */
 
@@ -270,6 +278,12 @@ int g_validate_ctx_id(vdb, ctx)
 {
    return(g_validate(vdb, V_CTX_ID, (void *) ctx));
 }
+int g_validate_lucidctx_id(vdb, lctx)
+     g_set *vdb;
+     void *lctx;
+{
+   return(g_validate(vdb, V_LCTX_ID, (void *) lctx));
+}
 
 /* delete */
 
@@ -291,4 +305,10 @@ int g_delete_ctx_id(vdb, ctx)
 {
    return(g_delete(vdb, V_CTX_ID, (void *) ctx));
 }
+int g_delete_lucidctx_id(vdb, lctx)
+     g_set *vdb;
+     void *lctx;
+{
+   return(g_delete(vdb, V_LCTX_ID, (void *) lctx));
+}
 
diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c
index 1ed2008a52..da20b71d6f 100644
--- a/src/lib/gssapi/generic/utl_nohash_validate.c
+++ b/src/lib/gssapi/generic/utl_nohash_validate.c
@@ -58,6 +58,12 @@ int g_save_ctx_id(vdb, ctx)
 {
 	return 1;
 }
+int g_save_lucidctx_id(vdb, lctx)
+     void **vdb;
+     void *lctx;
+{
+	return 1;
+}
 
 /* validate */
 
@@ -79,6 +85,12 @@ int g_validate_ctx_id(vdb, ctx)
 {
 	return 1;
 }
+int g_validate_lucidctx_id(vdb, lctx)
+     void **vdb;
+     void *lctx;
+{
+	return 1;
+}
 
 /* delete */
 
@@ -100,4 +112,10 @@ int g_delete_ctx_id(vdb, ctx)
 {
 	return 1;
 }
+int g_delete_lucidctx_id(vdb, lctx)
+     void **vdb;
+     void *lctx;
+{
+	return 1;
+}