Merge branch 'master' into users/lhoward/moonshot-mechglue-fixes

Conflicts:
	src/appl/gss-sample/gss-server.c
	src/lib/gssapi/mechglue/Makefile.in
	src/lib/gssapi/mechglue/g_acquire_cred.c
	src/lib/gssapi/mechglue/g_initialize.c

git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/moonshot-mechglue-fixes@24841 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 15 insertions, 17 deletions

diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h
index 152c1f2..5350dd3 100644
--- a/src/lib/gssapi/generic/gssapi_ext.h
+++ b/src/lib/gssapi/generic/gssapi_ext.h
@@ -389,22 +389,22 @@ OM_uint32 KRB5_CALLCONV gss_release_any_name_mapping
 /* draft-josefsson-gss-capsulate */
 OM_uint32 KRB5_CALLCONV gss_encapsulate_token
 (
-    const gss_buffer_t, /* input_token */
-    const gss_OID,      /* token_oid */
-    const gss_buffer_t  /* output_token */
+    gss_const_buffer_t, /* input_token */
+    gss_const_OID,      /* token_oid */
+    gss_buffer_t        /* output_token */
 );
 
 OM_uint32 KRB5_CALLCONV gss_decapsulate_token
 (
-    const gss_buffer_t, /* input_token */
-    const gss_OID,      /* token_oid */
+    gss_const_buffer_t, /* input_token */
+    gss_const_OID,      /* token_oid */
     gss_buffer_t        /* output_token */
 );
 
 int KRB5_CALLCONV gss_oid_equal
 (
-    const gss_OID,      /* first_oid */
-    const gss_OID       /* second_oid */
+    gss_const_OID,      /* first_oid */
+    gss_const_OID       /* second_oid */
 );
 
 #ifdef __cplusplus
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index 213df60..069080f 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -69,7 +69,7 @@ SRCS = \
 	$(srcdir)/g_verify.c \
 	$(srcdir)/g_wrap_aead.c \
 	$(srcdir)/g_wrap_iov.c \
-	$(srcdir)/gssd_pname_to_uid.c \
+	$(srcdir)/gssd_pname_to_uid.c
 
 OBJS = \
 	$(OUTPRE)g_accept_sec_context.$(OBJEXT) \
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index a5da2b8..71bbf9e 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
@@ -178,10 +178,8 @@ OM_uint32 *		time_rec;
     } /* for */
 
     /* ensure that we have at least one credential element */
-    if (creds->count < 1) {
-	assert(GSS_ERROR(major));
+    if (creds->count < 1)
 	goto cleanup;
-    }
 
     /*
      * fill in output parameters
diff --git a/src/lib/gssapi/mechglue/g_decapsulate_token.c b/src/lib/gssapi/mechglue/g_decapsulate_token.c
index a12d8f7..42b9e07 100644
--- a/src/lib/gssapi/mechglue/g_decapsulate_token.c
+++ b/src/lib/gssapi/mechglue/g_decapsulate_token.c
@@ -33,8 +33,8 @@
 #include "mglueP.h"
 
 OM_uint32
-gss_decapsulate_token(const gss_buffer_t input_token,
-                      const gss_OID token_oid,
+gss_decapsulate_token(gss_const_buffer_t input_token,
+                      gss_const_OID token_oid,
                       gss_buffer_t output_token)
 {
     OM_uint32 minor;
diff --git a/src/lib/gssapi/mechglue/g_encapsulate_token.c b/src/lib/gssapi/mechglue/g_encapsulate_token.c
index a60c796..b26e147 100644
--- a/src/lib/gssapi/mechglue/g_encapsulate_token.c
+++ b/src/lib/gssapi/mechglue/g_encapsulate_token.c
@@ -33,8 +33,8 @@
 #include "mglueP.h"
 
 OM_uint32
-gss_encapsulate_token(const gss_buffer_t input_token,
-                      const gss_OID token_oid,
+gss_encapsulate_token(gss_const_buffer_t input_token,
+                      gss_const_OID token_oid,
                       gss_buffer_t output_token)
 {
     unsigned int tokenSize;
diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
index e725167..d750368 100644
--- a/src/lib/gssapi/mechglue/g_oid_ops.c
+++ b/src/lib/gssapi/mechglue/g_oid_ops.c
@@ -105,8 +105,8 @@ gssint_copy_oid_set(
 
 int
 gss_oid_equal(
-    const gss_OID first_oid,
-    const gss_OID second_oid)
+    gss_const_OID first_oid,
+    gss_const_OID second_oid)
 {
     return g_OID_equal(first_oid, second_oid);
 }