cleanup unused parameter warnings

diff --git a/Makefile.am b/Makefile.am
index eb292a7..3e5a0a6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,9 @@ gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
-mech_eap_la_CFLAGS   = -g -Wall \
+mech_eap_la_CFLAGS   = -g -O -Wall -Wunused-parameter \
                        @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
-mech_eap_la_CXXFLAGS = -g -Wall \
+mech_eap_la_CXXFLAGS = -g -O -Wall -Wunused-parameter \
                        @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ \
                        @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@
 mech_eap_la_LDFLAGS  = -avoid-version -module \

diff --git a/accept_sec_context.c b/accept_sec_context.c
index eb38c92..5829ed9 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -126,16 +126,16 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
 
 static OM_uint32
 eapGssSmAcceptAcceptorName(OM_uint32 *minor,
-                           gss_cred_id_t cred,
+                           gss_cred_id_t cred GSSEAP_UNUSED,
                            gss_ctx_id_t ctx,
-                           gss_name_t target,
-                           gss_OID mech,
-                           OM_uint32 reqFlags,
-                           OM_uint32 timeReq,
-                           gss_channel_bindings_t chanBindings,
-                           gss_buffer_t inputToken,
+                           gss_name_t target GSSEAP_UNUSED,
+                           gss_OID mech GSSEAP_UNUSED,
+                           OM_uint32 reqFlags GSSEAP_UNUSED,
+                           OM_uint32 timeReq GSSEAP_UNUSED,
+                           gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                           gss_buffer_t inputToken GSSEAP_UNUSED,
                            gss_buffer_t outputToken,
-                           OM_uint32 *smFlags)
+                           OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major;
 
@@ -155,20 +155,21 @@ eapGssSmAcceptAcceptorName(OM_uint32 *minor,
 #ifdef GSSEAP_DEBUG
 static OM_uint32
 eapGssSmAcceptVendorInfo(OM_uint32 *minor,
-                         gss_cred_id_t cred,
-                         gss_ctx_id_t ctx,
-                         gss_name_t target,
-                         gss_OID mech,
-                         OM_uint32 reqFlags,
-                         OM_uint32 timeReq,
-                         gss_channel_bindings_t chanBindings,
+                         gss_cred_id_t cred GSSEAP_UNUSED,
+                         gss_ctx_id_t ctx GSSEAP_UNUSED,
+                         gss_name_t target GSSEAP_UNUSED,
+                         gss_OID mech GSSEAP_UNUSED,
+                         OM_uint32 reqFlags GSSEAP_UNUSED,
+                         OM_uint32 timeReq GSSEAP_UNUSED,
+                         gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
                          gss_buffer_t inputToken,
-                         gss_buffer_t outputToken,
-                         OM_uint32 *smFlags)
+                         gss_buffer_t outputToken GSSEAP_UNUSED,
+                         OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     fprintf(stderr, "GSS-EAP: vendor: %.*s\n",
             (int)inputToken->length, (char *)inputToken->value);
 
+    *minor = 0;
     return GSS_S_CONTINUE_NEEDED;
 }
 #endif
@@ -182,11 +183,11 @@ static OM_uint32
 eapGssSmAcceptIdentity(OM_uint32 *minor,
                        gss_cred_id_t cred,
                        gss_ctx_id_t ctx,
-                       gss_name_t target,
-                       gss_OID mech,
-                       OM_uint32 reqFlags,
-                       OM_uint32 timeReq,
-                       gss_channel_bindings_t chanBindings,
+                       gss_name_t target GSSEAP_UNUSED,
+                       gss_OID mech GSSEAP_UNUSED,
+                       OM_uint32 reqFlags GSSEAP_UNUSED,
+                       OM_uint32 timeReq GSSEAP_UNUSED,
+                       gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
                        gss_buffer_t inputToken,
                        gss_buffer_t outputToken,
                        OM_uint32 *smFlags)
@@ -467,11 +468,11 @@ static OM_uint32
 eapGssSmAcceptAuthenticate(OM_uint32 *minor,
                            gss_cred_id_t cred,
                            gss_ctx_id_t ctx,
-                           gss_name_t target,
-                           gss_OID mech,
-                           OM_uint32 reqFlags,
-                           OM_uint32 timeReq,
-                           gss_channel_bindings_t chanBindings,
+                           gss_name_t target GSSEAP_UNUSED,
+                           gss_OID mech GSSEAP_UNUSED,
+                           OM_uint32 reqFlags GSSEAP_UNUSED,
+                           OM_uint32 timeReq GSSEAP_UNUSED,
+                           gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
                            gss_buffer_t inputToken,
                            gss_buffer_t outputToken,
                            OM_uint32 *smFlags)
@@ -605,16 +606,16 @@ cleanup:
 
 static OM_uint32
 eapGssSmAcceptGssChannelBindings(OM_uint32 *minor,
-                                 gss_cred_id_t cred,
+                                 gss_cred_id_t cred GSSEAP_UNUSED,
                                  gss_ctx_id_t ctx,
-                                 gss_name_t target,
-                                 gss_OID mech,
-                                 OM_uint32 reqFlags,
-                                 OM_uint32 timeReq,
+                                 gss_name_t target GSSEAP_UNUSED,
+                                 gss_OID mech GSSEAP_UNUSED,
+                                 OM_uint32 reqFlags GSSEAP_UNUSED,
+                                 OM_uint32 timeReq GSSEAP_UNUSED,
                                  gss_channel_bindings_t chanBindings,
                                  gss_buffer_t inputToken,
-                                 gss_buffer_t outputToken,
-                                 OM_uint32 *smFlags)
+                                 gss_buffer_t outputToken GSSEAP_UNUSED,
+                                 OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major, tmpMinor;
     gss_iov_buffer_desc iov[2];
@@ -650,14 +651,14 @@ static OM_uint32
 eapGssSmAcceptReauthCreds(OM_uint32 *minor,
                           gss_cred_id_t cred,
                           gss_ctx_id_t ctx,
-                          gss_name_t target,
-                          gss_OID mech,
-                          OM_uint32 reqFlags,
-                          OM_uint32 timeReq,
-                          gss_channel_bindings_t chanBindings,
-                          gss_buffer_t inputToken,
+                          gss_name_t target GSSEAP_UNUSED,
+                          gss_OID mech GSSEAP_UNUSED,
+                          OM_uint32 reqFlags GSSEAP_UNUSED,
+                          OM_uint32 timeReq GSSEAP_UNUSED,
+                          gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                          gss_buffer_t inputToken GSSEAP_UNUSED,
                           gss_buffer_t outputToken,
-                          OM_uint32 *smFlags)
+                          OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major;
 
@@ -677,16 +678,16 @@ eapGssSmAcceptReauthCreds(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor,
-                                    gss_cred_id_t cred,
+                                    gss_cred_id_t cred GSSEAP_UNUSED,
                                     gss_ctx_id_t ctx,
-                                    gss_name_t target,
-                                    gss_OID mech,
-                                    OM_uint32 reqFlags,
-                                    OM_uint32 timeReq,
-                                    gss_channel_bindings_t chanBindings,
-                                    gss_buffer_t inputToken,
-                                    gss_buffer_t outputToken,
-                                    OM_uint32 *smFlags)
+                                    gss_name_t target GSSEAP_UNUSED,
+                                    gss_OID mech GSSEAP_UNUSED,
+                                    OM_uint32 reqFlags GSSEAP_UNUSED,
+                                    OM_uint32 timeReq GSSEAP_UNUSED,
+                                    gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                                    gss_buffer_t inputToken GSSEAP_UNUSED,
+                                    gss_buffer_t outputToken GSSEAP_UNUSED,
+                                    OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     GSSEAP_SM_TRANSITION_NEXT(ctx);
 
@@ -697,15 +698,15 @@ eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmAcceptCompleteAcceptorExts(OM_uint32 *minor,
-                                   gss_cred_id_t cred,
+                                   gss_cred_id_t cred GSSEAP_UNUSED,
                                    gss_ctx_id_t ctx,
-                                   gss_name_t target,
-                                   gss_OID mech,
-                                   OM_uint32 reqFlags,
-                                   OM_uint32 timeReq,
-                                   gss_channel_bindings_t chanBindings,
-                                   gss_buffer_t inputToken,
-                                   gss_buffer_t outputToken,
+                                   gss_name_t target GSSEAP_UNUSED,
+                                   gss_OID mech GSSEAP_UNUSED,
+                                   OM_uint32 reqFlags GSSEAP_UNUSED,
+                                   OM_uint32 timeReq GSSEAP_UNUSED,
+                                   gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                                   gss_buffer_t inputToken GSSEAP_UNUSED,
+                                   gss_buffer_t outputToken GSSEAP_UNUSED,
                                    OM_uint32 *smFlags)
 {
     GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED);
@@ -930,10 +931,10 @@ static OM_uint32
 eapGssSmAcceptGssReauth(OM_uint32 *minor,
                         gss_cred_id_t cred,
                         gss_ctx_id_t ctx,
-                        gss_name_t target,
+                        gss_name_t target GSSEAP_UNUSED,
                         gss_OID mech,
-                        OM_uint32 reqFlags,
-                        OM_uint32 timeReq,
+                        OM_uint32 reqFlags GSSEAP_UNUSED,
+                        OM_uint32 timeReq GSSEAP_UNUSED,
                         gss_channel_bindings_t chanBindings,
                         gss_buffer_t inputToken,
                         gss_buffer_t outputToken,

diff --git a/add_cred.c b/add_cred.c
index 491132c..37d0add 100644 (file)
--- a/add_cred.c
+++ b/add_cred.c
@@ -43,7 +43,7 @@
  */
 OM_uint32
 gss_add_cred(OM_uint32 *minor,
-             gss_cred_id_t input_cred_handle,
+             gss_cred_id_t input_cred_handle GSSEAP_UNUSED,
              gss_name_t desired_name,
              gss_OID desired_mech,
              gss_cred_usage_t cred_usage,

diff --git a/add_cred_with_password.c b/add_cred_with_password.c
index ca2eaed..7907138 100644 (file)
--- a/add_cred_with_password.c
+++ b/add_cred_with_password.c
@@ -38,7 +38,7 @@
 
 OM_uint32
 gss_add_cred_with_password(OM_uint32 *minor,
-                           const gss_cred_id_t input_cred_handle,
+                           const gss_cred_id_t input_cred_handle GSSEAP_UNUSED,
                            const gss_name_t desired_name,
                            const gss_OID desired_mech,
                            const gss_buffer_t password,

diff --git a/display_name_ext.c b/display_name_ext.c
index 76b443a..dff525f 100644 (file)
--- a/display_name_ext.c
+++ b/display_name_ext.c
@@ -38,8 +38,8 @@
 
 OM_uint32
 gss_display_name_ext(OM_uint32 *minor,
-                     gss_name_t name,
-                     gss_OID display_as_name_type,
+                     gss_name_t name GSSEAP_UNUSED,
+                     gss_OID display_as_name_type GSSEAP_UNUSED,
                      gss_buffer_t display_name)
 {
     *minor = 0;

diff --git a/display_status.c b/display_status.c
index c3c3cea..8729a96 100644 (file)
--- a/display_status.c
+++ b/display_status.c
@@ -157,7 +157,8 @@ gss_display_status(OM_uint32 *minor,
         return GSS_S_BAD_MECH;
     }
 
-    if (status_type != GSS_C_MECH_CODE) {
+    if (status_type != GSS_C_MECH_CODE ||
+        *message_context != 0) {
         /* we rely on the mechglue for GSS_C_GSS_CODE */
         *minor = 0;
         return GSS_S_BAD_STATUS;

diff --git a/init_sec_context.c b/init_sec_context.c
index e2aa259..951ea2b 100644 (file)
--- a/init_sec_context.c
+++ b/init_sec_context.c
@@ -161,18 +161,20 @@ peerGetEapReqData(void *ctx)
 }
 
 static void
-peerSetConfigBlob(void *ctx, struct wpa_config_blob *blob)
+peerSetConfigBlob(void *ctx GSSEAP_UNUSED,
+                  struct wpa_config_blob *blob GSSEAP_UNUSED)
 {
 }
 
 static const struct wpa_config_blob *
-peerGetConfigBlob(void *ctx, const char *name)
+peerGetConfigBlob(void *ctx GSSEAP_UNUSED,
+                  const char *name GSSEAP_UNUSED)
 {
     return NULL;
 }
 
 static void
-peerNotifyPending(void *ctx)
+peerNotifyPending(void *ctx GSSEAP_UNUSED)
 {
 }
 
@@ -324,9 +326,9 @@ initBegin(OM_uint32 *minor,
           gss_ctx_id_t ctx,
           gss_name_t target,
           gss_OID mech,
-          OM_uint32 reqFlags,
+          OM_uint32 reqFlags GSSEAP_UNUSED,
           OM_uint32 timeReq,
-          gss_channel_bindings_t chanBindings)
+          gss_channel_bindings_t chanBindings GSSEAP_UNUSED)
 {
     OM_uint32 major;
 
@@ -384,16 +386,16 @@ initBegin(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmInitError(OM_uint32 *minor,
-                  gss_cred_id_t cred,
-                  gss_ctx_id_t ctx,
-                  gss_name_t target,
-                  gss_OID mech,
-                  OM_uint32 reqFlags,
-                  OM_uint32 timeReq,
-                  gss_channel_bindings_t chanBindings,
+                  gss_cred_id_t cred GSSEAP_UNUSED,
+                  gss_ctx_id_t ctx GSSEAP_UNUSED,
+                  gss_name_t target GSSEAP_UNUSED,
+                  gss_OID mech GSSEAP_UNUSED,
+                  OM_uint32 reqFlags GSSEAP_UNUSED,
+                  OM_uint32 timeReq GSSEAP_UNUSED,
+                  gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
                   gss_buffer_t inputToken,
-                  gss_buffer_t outputToken,
-                  OM_uint32 *smFlags)
+                  gss_buffer_t outputToken GSSEAP_UNUSED,
+                  OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major;
     unsigned char *p;
@@ -424,13 +426,13 @@ eapGssSmInitGssReauth(OM_uint32 *minor,
                       gss_cred_id_t cred,
                       gss_ctx_id_t ctx,
                       gss_name_t target,
-                      gss_OID mech,
+                      gss_OID mech GSSEAP_UNUSED,
                       OM_uint32 reqFlags,
                       OM_uint32 timeReq,
                       gss_channel_bindings_t chanBindings,
                       gss_buffer_t inputToken,
                       gss_buffer_t outputToken,
-                      OM_uint32 *smFlags)
+                      OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major, tmpMinor;
     gss_name_t mechTarget = GSS_C_NO_NAME;
@@ -493,16 +495,16 @@ cleanup:
 #ifdef GSSEAP_DEBUG
 static OM_uint32
 eapGssSmInitVendorInfo(OM_uint32 *minor,
-                       gss_cred_id_t cred,
-                       gss_ctx_id_t ctx,
-                       gss_name_t target,
-                       gss_OID mech,
-                       OM_uint32 reqFlags,
-                       OM_uint32 timeReq,
-                       gss_channel_bindings_t chanBindings,
-                       gss_buffer_t inputToken,
+                       gss_cred_id_t cred GSSEAP_UNUSED,
+                       gss_ctx_id_t ctx GSSEAP_UNUSED,
+                       gss_name_t target GSSEAP_UNUSED,
+                       gss_OID mech GSSEAP_UNUSED,
+                       OM_uint32 reqFlags GSSEAP_UNUSED,
+                       OM_uint32 timeReq GSSEAP_UNUSED,
+                       gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                       gss_buffer_t inputToken GSSEAP_UNUSED,
                        gss_buffer_t outputToken,
-                       OM_uint32 *smFlags)
+                       OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major;
 
@@ -516,16 +518,16 @@ eapGssSmInitVendorInfo(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmInitAcceptorName(OM_uint32 *minor,
-                         gss_cred_id_t cred,
+                         gss_cred_id_t cred GSSEAP_UNUSED,
                          gss_ctx_id_t ctx,
-                         gss_name_t target,
-                         gss_OID mech,
-                         OM_uint32 reqFlags,
-                         OM_uint32 timeReq,
-                         gss_channel_bindings_t chanBindings,
-                         gss_buffer_t inputToken,
+                         gss_name_t target GSSEAP_UNUSED,
+                         gss_OID mech GSSEAP_UNUSED,
+                         OM_uint32 reqFlags GSSEAP_UNUSED,
+                         OM_uint32 timeReq GSSEAP_UNUSED,
+                         gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                         gss_buffer_t inputToken GSSEAP_UNUSED,
                          gss_buffer_t outputToken,
-                         OM_uint32 *smFlags)
+                         OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major;
 
@@ -560,15 +562,15 @@ eapGssSmInitAcceptorName(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmInitIdentity(OM_uint32 *minor,
-                     gss_cred_id_t cred,
+                     gss_cred_id_t cred GSSEAP_UNUSED,
                      gss_ctx_id_t ctx,
-                     gss_name_t target,
-                     gss_OID mech,
-                     OM_uint32 reqFlags,
-                     OM_uint32 timeReq,
-                     gss_channel_bindings_t chanBindings,
-                     gss_buffer_t inputToken,
-                     gss_buffer_t outputToken,
+                     gss_name_t target GSSEAP_UNUSED,
+                     gss_OID mech GSSEAP_UNUSED,
+                     OM_uint32 reqFlags GSSEAP_UNUSED,
+                     OM_uint32 timeReq GSSEAP_UNUSED,
+                     gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                     gss_buffer_t inputToken GSSEAP_UNUSED,
+                     gss_buffer_t outputToken GSSEAP_UNUSED,
                      OM_uint32 *smFlags)
 {
     struct eap_config eapConfig;
@@ -618,12 +620,12 @@ static OM_uint32
 eapGssSmInitAuthenticate(OM_uint32 *minor,
                          gss_cred_id_t cred,
                          gss_ctx_id_t ctx,
-                         gss_name_t target,
-                         gss_OID mech,
-                         OM_uint32 reqFlags,
-                         OM_uint32 timeReq,
-                         gss_channel_bindings_t chanBindings,
-                         gss_buffer_t inputToken,
+                         gss_name_t target GSSEAP_UNUSED,
+                         gss_OID mech GSSEAP_UNUSED,
+                         OM_uint32 reqFlags GSSEAP_UNUSED,
+                         OM_uint32 timeReq GSSEAP_UNUSED,
+                         gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                         gss_buffer_t inputToken GSSEAP_UNUSED,
                          gss_buffer_t outputToken,
                          OM_uint32 *smFlags)
 {
@@ -698,14 +700,14 @@ cleanup:
 
 static OM_uint32
 eapGssSmInitGssChannelBindings(OM_uint32 *minor,
-                               gss_cred_id_t cred,
+                               gss_cred_id_t cred GSSEAP_UNUSED,
                                gss_ctx_id_t ctx,
-                               gss_name_t target,
-                               gss_OID mech,
-                               OM_uint32 reqFlags,
-                               OM_uint32 timeReq,
+                               gss_name_t target GSSEAP_UNUSED,
+                               gss_OID mech GSSEAP_UNUSED,
+                               OM_uint32 reqFlags GSSEAP_UNUSED,
+                               OM_uint32 timeReq GSSEAP_UNUSED,
                                gss_channel_bindings_t chanBindings,
-                               gss_buffer_t inputToken,
+                               gss_buffer_t inputToken GSSEAP_UNUSED,
                                gss_buffer_t outputToken,
                                OM_uint32 *smFlags)
 {
@@ -733,14 +735,14 @@ static OM_uint32
 eapGssSmInitReauthCreds(OM_uint32 *minor,
                         gss_cred_id_t cred,
                         gss_ctx_id_t ctx,
-                        gss_name_t target,
-                        gss_OID mech,
-                        OM_uint32 reqFlags,
-                        OM_uint32 timeReq,
-                        gss_channel_bindings_t chanBindings,
+                        gss_name_t target GSSEAP_UNUSED,
+                        gss_OID mech GSSEAP_UNUSED,
+                        OM_uint32 reqFlags GSSEAP_UNUSED,
+                        OM_uint32 timeReq GSSEAP_UNUSED,
+                        gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
                         gss_buffer_t inputToken,
-                        gss_buffer_t outputToken,
-                        OM_uint32 *smFlags)
+                        gss_buffer_t outputToken GSSEAP_UNUSED,
+                        OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     OM_uint32 major;
 
@@ -757,15 +759,15 @@ eapGssSmInitReauthCreds(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmInitCompleteInitiatorExts(OM_uint32 *minor,
-                                  gss_cred_id_t cred,
+                                  gss_cred_id_t cred GSSEAP_UNUSED,
                                   gss_ctx_id_t ctx,
-                                  gss_name_t target,
-                                  gss_OID mech,
-                                  OM_uint32 reqFlags,
-                                  OM_uint32 timeReq,
-                                  gss_channel_bindings_t chanBindings,
-                                  gss_buffer_t inputToken,
-                                  gss_buffer_t outputToken,
+                                  gss_name_t target GSSEAP_UNUSED,
+                                  gss_OID mech GSSEAP_UNUSED,
+                                  OM_uint32 reqFlags GSSEAP_UNUSED,
+                                  OM_uint32 timeReq GSSEAP_UNUSED,
+                                  gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                                  gss_buffer_t inputToken GSSEAP_UNUSED,
+                                  gss_buffer_t outputToken GSSEAP_UNUSED,
                                   OM_uint32 *smFlags)
 {
     GSSEAP_SM_TRANSITION_NEXT(ctx);
@@ -778,16 +780,16 @@ eapGssSmInitCompleteInitiatorExts(OM_uint32 *minor,
 
 static OM_uint32
 eapGssSmInitCompleteAcceptorExts(OM_uint32 *minor,
-                                 gss_cred_id_t cred,
+                                 gss_cred_id_t cred GSSEAP_UNUSED,
                                  gss_ctx_id_t ctx,
-                                 gss_name_t target,
-                                 gss_OID mech,
-                                 OM_uint32 reqFlags,
-                                 OM_uint32 timeReq,
-                                 gss_channel_bindings_t chanBindings,
-                                 gss_buffer_t inputToken,
-                                 gss_buffer_t outputToken,
-                                 OM_uint32 *smFlags)
+                                 gss_name_t target GSSEAP_UNUSED,
+                                 gss_OID mech GSSEAP_UNUSED,
+                                 OM_uint32 reqFlags GSSEAP_UNUSED,
+                                 OM_uint32 timeReq GSSEAP_UNUSED,
+                                 gss_channel_bindings_t chanBindings GSSEAP_UNUSED,
+                                 gss_buffer_t inputToken GSSEAP_UNUSED,
+                                 gss_buffer_t outputToken GSSEAP_UNUSED,
+                                 OM_uint32 *smFlags GSSEAP_UNUSED)
 {
     GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED);
 

diff --git a/inquire_mechs_for_name.c b/inquire_mechs_for_name.c
index 63dcd6e..f8a5d06 100644 (file)
--- a/inquire_mechs_for_name.c
+++ b/inquire_mechs_for_name.c
@@ -38,7 +38,7 @@
 
 OM_uint32
 gss_inquire_mechs_for_name(OM_uint32 *minor,
-                           const gss_name_t input_name,
+                           const gss_name_t input_name GSSEAP_UNUSED,
                            gss_OID_set *mech_types)
 {
     return gssEapIndicateMechs(minor, mech_types);

diff --git a/inquire_sec_context_by_oid.c b/inquire_sec_context_by_oid.c
index 816a4c9..a69b9e9 100644 (file)
--- a/inquire_sec_context_by_oid.c
+++ b/inquire_sec_context_by_oid.c
@@ -39,7 +39,7 @@
 static OM_uint32
 inquireSessionKey(OM_uint32 *minor,
                   const gss_ctx_id_t ctx,
-                  const gss_OID desired_object,
+                  const gss_OID desired_object GSSEAP_UNUSED,
                   gss_buffer_set_t *dataSet)
 {
     OM_uint32 major, tmpMinor;

diff --git a/set_cred_option.c b/set_cred_option.c
index 5d3f997..5f37c84 100644 (file)
--- a/set_cred_option.c
+++ b/set_cred_option.c
@@ -39,7 +39,7 @@
 static OM_uint32
 setCredRadiusConfigFile(OM_uint32 *minor,
                         gss_cred_id_t cred,
-                        const gss_OID oid,
+                        const gss_OID oid GSSEAP_UNUSED,
                         const gss_buffer_t buffer)
 {
     OM_uint32 major;
@@ -63,7 +63,7 @@ setCredRadiusConfigFile(OM_uint32 *minor,
 static OM_uint32
 setCredRadiusConfigStanza(OM_uint32 *minor,
                           gss_cred_id_t cred,
-                          const gss_OID oid,
+                          const gss_OID oid GSSEAP_UNUSED,
                           const gss_buffer_t buffer)
 {
     OM_uint32 major;
@@ -87,7 +87,7 @@ setCredRadiusConfigStanza(OM_uint32 *minor,
 static OM_uint32
 setCredFlag(OM_uint32 *minor,
             gss_cred_id_t cred,
-            const gss_OID oid,
+            const gss_OID oid GSSEAP_UNUSED,
             const gss_buffer_t buffer)
 {
     OM_uint32 flags;

diff --git a/store_cred.c b/store_cred.c
index 125dd92..3811806 100644 (file)
--- a/store_cred.c
+++ b/store_cred.c
@@ -36,7 +36,7 @@ OM_uint32
 gss_store_cred(OM_uint32 *minor,
                const gss_cred_id_t cred,
                gss_cred_usage_t input_usage,
-               const gss_OID desired_mech,
+               const gss_OID desired_mech GSSEAP_UNUSED,
                OM_uint32 overwrite_cred,
                OM_uint32 default_cred,
                gss_OID_set *elements_stored,

diff --git a/unwrap_iov.c b/unwrap_iov.c
index fa9a6a5..19bafc6 100644 (file)
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -70,7 +70,7 @@ unwrapToken(OM_uint32 *minor,
 #ifdef HAVE_HEIMDAL_VERSION
             krb5_crypto krbCrypto,
 #else
-            krb5_keyblock *unused,
+            krb5_keyblock *unused GSSEAP_UNUSED,
 #endif
             int *conf_state,
             gss_qop_t *qop_state,

diff --git a/util.h b/util.h
index e6c08ef..ddf95a9 100644 (file)
--- a/util.h
+++ b/util.h
@@ -75,6 +75,12 @@ extern "C" {
 #define MIN(_a,_b)  ((_a)<(_b)?(_a):(_b))
 #endif
 
+#if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#define GSSEAP_UNUSED __attribute__ ((__unused__)) 
+#else
+#define GSSEAP_UNUSED
+#endif
+
 /* util_buffer.c */
 OM_uint32
 makeStringBuffer(OM_uint32 *minor,

diff --git a/util_adshim.c b/util_adshim.c
index 30b525f..b74a29a 100644 (file)
--- a/util_adshim.c
+++ b/util_adshim.c
@@ -49,31 +49,33 @@ static krb5_data radius_ad_attr = {
     KV5M_DATA, sizeof("urn:authdata-radius-avp") - 1, "urn:authdata-radius-avp" };
 
 static krb5_error_code
-radius_ad_init(krb5_context kcontext, void **plugin_context)
+radius_ad_init(krb5_context kcontext GSSEAP_UNUSED,
+               void **plugin_context)
 {
     *plugin_context = 0;
     return 0;
 }
 
 static void
-radius_ad_flags(krb5_context kcontext,
-                void *plugin_context,
-                krb5_authdatatype ad_type,
+radius_ad_flags(krb5_context kcontext GSSEAP_UNUSED,
+                void *plugin_context GSSEAP_UNUSED,
+                krb5_authdatatype ad_type GSSEAP_UNUSED,
                 krb5_flags *flags)
 {
     *flags = AD_USAGE_KDC_ISSUED | AD_INFORMATIONAL;
 }
 
 static void
-radius_ad_fini(krb5_context kcontext, void *plugin_context)
+radius_ad_fini(krb5_context kcontext GSSEAP_UNUSED,
+               void *plugin_context GSSEAP_UNUSED)
 {
     return;
 }
 
 static krb5_error_code
-radius_ad_request_init(krb5_context kcontext,
-                       struct _krb5_authdata_context *context,
-                       void *plugin_context,
+radius_ad_request_init(krb5_context kcontext GSSEAP_UNUSED,
+                       struct _krb5_authdata_context *context GSSEAP_UNUSED,
+                       void *plugin_context GSSEAP_UNUSED,
                        void **request_context)
 {
     struct radius_ad_context *ctx;
@@ -89,10 +91,10 @@ radius_ad_request_init(krb5_context kcontext,
 
 static krb5_error_code
 radius_ad_export_authdata(krb5_context kcontext,
-                          struct _krb5_authdata_context *context,
-                          void *plugin_context,
+                          struct _krb5_authdata_context *context GSSEAP_UNUSED,
+                          void *plugin_context GSSEAP_UNUSED,
                           void *request_context,
-                          krb5_flags usage,
+                          krb5_flags usage GSSEAP_UNUSED,
                           krb5_authdata ***out_authdata)
 {
     struct radius_ad_context *radius_ad = (struct radius_ad_context *)request_context;
@@ -111,12 +113,12 @@ radius_ad_export_authdata(krb5_context kcontext,
 
 static krb5_error_code
 radius_ad_import_authdata(krb5_context kcontext,
-                          struct _krb5_authdata_context *context,
-                          void *plugin_context,
+                          struct _krb5_authdata_context *context GSSEAP_UNUSED,
+                          void *plugin_context GSSEAP_UNUSED,
                           void *request_context,
                           krb5_authdata **authdata,
                           krb5_boolean kdc_issued_flag,
-                          krb5_const_principal issuer)
+                          krb5_const_principal issuer GSSEAP_UNUSED)
 {
     struct radius_ad_context *radius_ad = (struct radius_ad_context *)request_context;
 
@@ -140,8 +142,8 @@ radius_ad_import_authdata(krb5_context kcontext,
 
 static void
 radius_ad_request_fini(krb5_context kcontext,
-                       struct _krb5_authdata_context *context,
-                       void *plugin_context,
+                       struct _krb5_authdata_context *context GSSEAP_UNUSED,
+                       void *plugin_context GSSEAP_UNUSED,
                        void *request_context)
 {
     struct radius_ad_context *radius_ad = (struct radius_ad_context *)request_context;
@@ -153,15 +155,15 @@ radius_ad_request_fini(krb5_context kcontext,
 }
 
 static krb5_error_code
-radius_ad_get_attribute(krb5_context kcontext,
-                        struct _krb5_authdata_context *context,
-                        void *plugin_context,
+radius_ad_get_attribute(krb5_context kcontext GSSEAP_UNUSED,
+                        struct _krb5_authdata_context *context GSSEAP_UNUSED,
+                        void *plugin_context GSSEAP_UNUSED,
                         void *request_context,
                         const krb5_data *attribute,
                         krb5_boolean *authenticated,
                         krb5_boolean *complete,
                         krb5_data *value,
-                        krb5_data *display_value,
+                        krb5_data *display_value GSSEAP_UNUSED,
                         int *more)
 {
     struct radius_ad_context *radius_ad = (struct radius_ad_context *)request_context;
@@ -189,11 +191,11 @@ radius_ad_get_attribute(krb5_context kcontext,
 }
 
 static krb5_error_code
-radius_ad_copy(krb5_context kcontext,
-               struct _krb5_authdata_context *context,
-               void *plugin_context,
+radius_ad_copy(krb5_context kcontext GSSEAP_UNUSED,
+               struct _krb5_authdata_context *context GSSEAP_UNUSED,
+               void *plugin_context GSSEAP_UNUSED,
                void *request_context,
-               void *dst_plugin_context,
+               void *dst_plugin_context GSSEAP_UNUSED,
                void *dst_request_context)
 {
     struct radius_ad_context *radius_ad_src =

diff --git a/util_attr.cpp b/util_attr.cpp
index 9266b6b..28065ac 100644 (file)
--- a/util_attr.cpp
+++ b/util_attr.cpp
@@ -425,7 +425,7 @@ struct eap_gss_get_attr_types_args {
 };
 
 static bool
-addAttribute(const gss_eap_attr_provider *provider,
+addAttribute(const gss_eap_attr_provider *provider GSSEAP_UNUSED,
              const gss_buffer_t attribute,
              void *data)
 {
@@ -760,8 +760,8 @@ gss_eap_attr_ctx::composeAttributeName(unsigned int type,
 OM_uint32
 gssEapInquireName(OM_uint32 *minor,
                   gss_name_t name,
-                  int *name_is_MN,
-                  gss_OID *MN_mech,
+                  int *name_is_MN GSSEAP_UNUSED,
+                  gss_OID *MN_mech GSSEAP_UNUSED,
                   gss_buffer_set_t *attrs)
 {
     if (name->attrCtx == NULL) {
@@ -1029,6 +1029,7 @@ gssEapReleaseAttrContext(OM_uint32 *minor,
     if (name->attrCtx != NULL)
         delete name->attrCtx;
 
+    *minor = 0;
     return GSS_S_COMPLETE;
 }
 
@@ -1043,7 +1044,7 @@ gssEapCreateAttrContext(OM_uint32 *minor,
                         struct gss_eap_attr_ctx **pAttrContext,
                         time_t *pExpiryTime)
 {
-    gss_eap_attr_ctx *ctx;
+    gss_eap_attr_ctx *ctx = NULL;
     OM_uint32 major;
 
     assert(gssCtx != GSS_C_NO_CONTEXT);
@@ -1052,22 +1053,26 @@ gssEapCreateAttrContext(OM_uint32 *minor,
     if (GSS_ERROR(major))
         return major;
 
+    *minor = GSSEAP_ATTR_CONTEXT_FAILURE;
+    major = GSS_S_FAILURE;
+
     try {
         ctx = new gss_eap_attr_ctx();
-        if (!ctx->initFromGssContext(gssCred, gssCtx)) {
+        if (ctx->initFromGssContext(gssCred, gssCtx)) {
+            *minor = 0;
+            major = GSS_S_COMPLETE;
+        } else {
             delete ctx;
-            *minor = GSSEAP_ATTR_CONTEXT_FAILURE;
-            return GSS_S_FAILURE;
         }
     } catch (std::exception &e) {
-        major = ctx->mapException(minor, e);
-        delete ctx;
-        return major;
+        if (ctx != NULL)
+            major = ctx->mapException(minor, e);
     }
 
-    *pAttrContext = ctx;
-    *pExpiryTime = ctx->getExpiryTime();
+    if (major == GSS_S_COMPLETE) {
+        *pAttrContext = ctx;
+        *pExpiryTime = ctx->getExpiryTime();
+    }
 
-    *minor = 0;
-    return GSS_S_COMPLETE;
+    return major;
 }

diff --git a/util_attr.h b/util_attr.h
index c256e82..90a8c91 100644 (file)
--- a/util_attr.h
+++ b/util_attr.h
@@ -75,50 +75,73 @@ public:
     }
 
     virtual bool initFromExistingContext(const gss_eap_attr_ctx *manager,
-                                         const gss_eap_attr_provider *ctx)
+                                         const gss_eap_attr_provider *ctx GSSEAP_UNUSED)
     {
         return initWithManager(manager);
     }
 
     virtual bool initFromGssContext(const gss_eap_attr_ctx *manager,
-                                    const gss_cred_id_t cred,
-                                    const gss_ctx_id_t ctx)
+                                    const gss_cred_id_t cred GSSEAP_UNUSED,
+                                    const gss_ctx_id_t ctx GSSEAP_UNUSED)
     {
         return initWithManager(manager);
     }
 
-    virtual bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const
+    virtual bool getAttributeTypes(gss_eap_attr_enumeration_cb GSSEAP_UNUSED,
+                                   void *data GSSEAP_UNUSED) const
     {
         return false;
     }
 
-    virtual bool setAttribute(int complete,
-                              const gss_buffer_t attr,
-                              const gss_buffer_t value) { return false; }
-    virtual bool deleteAttribute(const gss_buffer_t value) { return false; }
-    virtual bool getAttribute(const gss_buffer_t attr,
-                              int *authenticated,
-                              int *complete,
-                              gss_buffer_t value,
-                              gss_buffer_t display_value,
-                              int *more) const { return false; }
-
-    virtual gss_any_t mapToAny(int authenticated,
-                               gss_buffer_t type_id) const { return NULL; }
-    virtual void releaseAnyNameMapping(gss_buffer_t type_id,
-                                       gss_any_t input) const {}
-
-    virtual void exportToBuffer(gss_buffer_t buffer) const {}
+    virtual bool setAttribute(int complete GSSEAP_UNUSED,
+                              const gss_buffer_t attr GSSEAP_UNUSED,
+                              const gss_buffer_t value GSSEAP_UNUSED)
+    {
+        return false;
+    }
+
+    virtual bool deleteAttribute(const gss_buffer_t value GSSEAP_UNUSED)
+    {
+        return false;
+    }
+
+    virtual bool getAttribute(const gss_buffer_t attr GSSEAP_UNUSED,
+                              int *authenticated GSSEAP_UNUSED,
+                              int *complete GSSEAP_UNUSED,
+                              gss_buffer_t value GSSEAP_UNUSED,
+                              gss_buffer_t display_value GSSEAP_UNUSED,
+                              int *more GSSEAP_UNUSED) const
+    {
+        return false;
+    }
+
+    virtual gss_any_t mapToAny(int authenticated GSSEAP_UNUSED,
+                               gss_buffer_t type_id GSSEAP_UNUSED) const
+    {
+        return NULL;
+    }
+    virtual void releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
+                                       gss_any_t input GSSEAP_UNUSED) const
+    {
+    }
+
+    virtual void exportToBuffer(gss_buffer_t buffer GSSEAP_UNUSED) const
+    {
+    }
+
     virtual bool initFromBuffer(const gss_eap_attr_ctx *manager,
-                                const gss_buffer_t buffer)
+                                const gss_buffer_t buffer GSSEAP_UNUSED)
     {
         return initWithManager(manager);
     }
 
     virtual time_t getExpiryTime(void) const { return 0; }
 
-    virtual OM_uint32 mapException(OM_uint32 *minor, std::exception &e) const
-    { return GSS_S_CONTINUE_NEEDED; }
+    virtual OM_uint32 mapException(OM_uint32 *minor GSSEAP_UNUSED,
+                                   std::exception &e GSSEAP_UNUSED) const
+    {
+        return GSS_S_CONTINUE_NEEDED;
+    }
 
     static bool init(void) { return true; }
     static void finalize(void) {}

diff --git a/util_context.c b/util_context.c
index 4fb8161..03bad1c 100644 (file)
--- a/util_context.c
+++ b/util_context.c
@@ -216,6 +216,8 @@ gssEapContextTime(OM_uint32 *minor,
                   gss_ctx_id_t context_handle,
                   OM_uint32 *time_rec)
 {
+    *minor = 0;
+
     if (context_handle->expiryTime == 0) {
         *time_rec = GSS_C_INDEFINITE;
     } else {

diff --git a/util_cred.c b/util_cred.c
index eeebea6..6330118 100644 (file)
--- a/util_cred.c
+++ b/util_cred.c
@@ -111,7 +111,7 @@ OM_uint32
 gssEapAcquireCred(OM_uint32 *minor,
                   const gss_name_t desiredName,
                   const gss_buffer_t password,
-                  OM_uint32 timeReq,
+                  OM_uint32 timeReq GSSEAP_UNUSED,
                   const gss_OID_set desiredMechs,
                   int credUsage,
                   gss_cred_id_t *pCred,

diff --git a/util_krb.c b/util_krb.c
index 1a47cab..836fef1 100644 (file)
--- a/util_krb.c
+++ b/util_krb.c
@@ -370,7 +370,12 @@ krbBlockSize(krb5_context krbContext,
 }
 
 krb5_error_code
-krbEnctypeToString(krb5_context krbContext,
+krbEnctypeToString(
+#ifdef HAVE_HEIMDAL_VERSION
+                   krb5_context krbContext,
+#else
+                   krb5_context krbContext GSSEAP_UNUSED,
+#endif
                    krb5_enctype enctype,
                    const char *prefix,
                    gss_buffer_t string)

diff --git a/util_lucid.c b/util_lucid.c
index 6c725fd..359058c 100644 (file)
--- a/util_lucid.c
+++ b/util_lucid.c
@@ -39,7 +39,7 @@
 OM_uint32
 gssEapExportLucidSecContext(OM_uint32 *minor,
                             gss_ctx_id_t ctx,
-                            const gss_OID desiredObject,
+                            const gss_OID desiredObject GSSEAP_UNUSED,
                             gss_buffer_set_t *data_set)
 {
     OM_uint32 major = GSS_S_COMPLETE;

diff --git a/util_name.c b/util_name.c
index 26154a8..d365f98 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -227,7 +227,7 @@ importUserName(OM_uint32 *minor,
 
 static OM_uint32
 importAnonymousName(OM_uint32 *minor,
-                    const gss_buffer_t nameBuffer,
+                    const gss_buffer_t nameBuffer GSSEAP_UNUSED,
                     gss_name_t *pName)
 {
     OM_uint32 major;

diff --git a/util_ordering.c b/util_ordering.c
index dc73622..71ebfb5 100644 (file)
--- a/util_ordering.c
+++ b/util_ordering.c
@@ -152,6 +152,8 @@ sequenceCheck(OM_uint32 *minor,
     int i;
     uint64_t expected;
 
+    *minor = 0;
+
     q = (queue *) (*vqueue);
 
     if (!q->do_replay && !q->do_sequence)
@@ -241,6 +243,7 @@ sequenceFree(OM_uint32 *minor, void **vqueue)
 
     *vqueue = NULL;
 
+    *minor = 0;
     return GSS_S_COMPLETE;
 }
 
@@ -248,7 +251,7 @@ sequenceFree(OM_uint32 *minor, void **vqueue)
  * These support functions are for the serialization routines
  */
 size_t
-sequenceSize(void *vqueue)
+sequenceSize(void *vqueue GSSEAP_UNUSED)
 {
     return sizeof(queue);
 }

diff --git a/util_radius.cpp b/util_radius.cpp
index 48fa6f0..083b3e7 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -263,7 +263,7 @@ getAttributeId(const gss_buffer_t attr)
 }
 
 bool
-gss_eap_radius_attr_provider::setAttribute(int complete,
+gss_eap_radius_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
                                            uint32_t attrid,
                                            const gss_buffer_t value)
 {
@@ -428,7 +428,7 @@ gss_eap_radius_attr_provider::getAttribute(uint16_t attribute,
 
 gss_any_t
 gss_eap_radius_attr_provider::mapToAny(int authenticated,
-                                       gss_buffer_t type_id) const
+                                       gss_buffer_t type_id GSSEAP_UNUSED) const
 {
     if (authenticated && !m_authenticated)
         return (gss_any_t)NULL;
@@ -437,7 +437,7 @@ gss_eap_radius_attr_provider::mapToAny(int authenticated,
 }
 
 void
-gss_eap_radius_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id,
+gss_eap_radius_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
                                                     gss_any_t input) const
 {
     pairfree((VALUE_PAIR **)&input);
@@ -606,6 +606,8 @@ OM_uint32
 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor)
 {
     gss_eap_radius_attr_provider::finalize();
+
+    *minor = 0;
     return GSS_S_COMPLETE;
 }
 

diff --git a/util_reauth.c b/util_reauth.c
index a03f285..820f6e6 100644 (file)
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -375,7 +375,7 @@ cleanup:
 }
 
 static int
-isTicketGrantingServiceP(krb5_context krbContext,
+isTicketGrantingServiceP(krb5_context krbContext GSSEAP_UNUSED,
                          krb5_const_principal principal)
 {
     if (KRB_PRINC_LENGTH(principal) == 2 &&
@@ -652,7 +652,11 @@ static gss_buffer_desc radiusAvpKrbAttr = {
  */
 static OM_uint32
 defrostAttrContext(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
                    gss_ctx_id_t glueContext,
+#else
+                   gss_ctx_id_t glueContext GSSEAP_UNUSED,
+#endif
                    gss_name_t glueName,
                    gss_name_t mechName)
 {
@@ -786,7 +790,7 @@ cleanup:
 OM_uint32
 gssEapReauthComplete(OM_uint32 *minor,
                      gss_ctx_id_t ctx,
-                     gss_cred_id_t cred,
+                     gss_cred_id_t cred GSSEAP_UNUSED,
                      const gss_OID mech,
                      OM_uint32 timeRec)
 {

diff --git a/util_saml.cpp b/util_saml.cpp
index dba698c..5346cc4 100644 (file)
--- a/util_saml.cpp
+++ b/util_saml.cpp
@@ -194,7 +194,7 @@ gss_eap_saml_assertion_provider::getAttributeTypes(gss_eap_attr_enumeration_cb a
 }
 
 bool
-gss_eap_saml_assertion_provider::setAttribute(int complete,
+gss_eap_saml_assertion_provider::setAttribute(int complete GSSEAP_UNUSED,
                                               const gss_buffer_t attr,
                                               const gss_buffer_t value)
 {
@@ -207,7 +207,7 @@ gss_eap_saml_assertion_provider::setAttribute(int complete,
 }
 
 bool
-gss_eap_saml_assertion_provider::deleteAttribute(const gss_buffer_t value)
+gss_eap_saml_assertion_provider::deleteAttribute(const gss_buffer_t value GSSEAP_UNUSED)
 {
     delete m_assertion;
     m_assertion = NULL;
@@ -260,7 +260,7 @@ gss_eap_saml_assertion_provider::getAttribute(const gss_buffer_t attr,
                                               int *authenticated,
                                               int *complete,
                                               gss_buffer_t value,
-                                              gss_buffer_t display_value,
+                                              gss_buffer_t display_value GSSEAP_UNUSED,
                                               int *more) const
 {
     string str;
@@ -289,7 +289,7 @@ gss_eap_saml_assertion_provider::getAttribute(const gss_buffer_t attr,
 
 gss_any_t
 gss_eap_saml_assertion_provider::mapToAny(int authenticated,
-                                          gss_buffer_t type_id) const
+                                          gss_buffer_t type_id GSSEAP_UNUSED) const
 {
     if (authenticated && !m_authenticated)
         return (gss_any_t)NULL;
@@ -298,7 +298,7 @@ gss_eap_saml_assertion_provider::mapToAny(int authenticated,
 }
 
 void
-gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id,
+gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
                                                        gss_any_t input) const
 {
     delete ((saml2::Assertion *)input);
@@ -491,7 +491,7 @@ decomposeAttributeName(const gss_buffer_t attr)
 }
 
 bool
-gss_eap_saml_attr_provider::setAttribute(int complete,
+gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
                                          const gss_buffer_t attr,
                                          const gss_buffer_t value)
 {
@@ -683,15 +683,15 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
 }
 
 gss_any_t
-gss_eap_saml_attr_provider::mapToAny(int authenticated,
-                                     gss_buffer_t type_id) const
+gss_eap_saml_attr_provider::mapToAny(int authenticated GSSEAP_UNUSED,
+                                     gss_buffer_t type_id GSSEAP_UNUSED) const
 {
     return (gss_any_t)NULL;
 }
 
 void
-gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id,
-                                                  gss_any_t input) const
+gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
+                                                  gss_any_t input GSSEAP_UNUSED) const
 {
 }
 
@@ -747,5 +747,7 @@ gssEapSamlAttrProvidersFinalize(OM_uint32 *minor)
 {
     gss_eap_saml_attr_provider::finalize();
     gss_eap_saml_assertion_provider::finalize();
+
+    *minor = 0;
     return GSS_S_COMPLETE;
 }

diff --git a/util_shib.cpp b/util_shib.cpp
index 90af118..04ef90f 100644 (file)
--- a/util_shib.cpp
+++ b/util_shib.cpp
@@ -227,7 +227,7 @@ gss_eap_shib_attr_provider::getAttributeIndex(const gss_buffer_t attr) const
 }
 
 bool
-gss_eap_shib_attr_provider::setAttribute(int complete,
+gss_eap_shib_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
                                          const gss_buffer_t attr,
                                          const gss_buffer_t value)
 {
@@ -355,7 +355,7 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr,
 
 gss_any_t
 gss_eap_shib_attr_provider::mapToAny(int authenticated,
-                                     gss_buffer_t type_id) const
+                                     gss_buffer_t type_id GSSEAP_UNUSED) const
 {
     gss_any_t output;
 
@@ -370,7 +370,7 @@ gss_eap_shib_attr_provider::mapToAny(int authenticated,
 }
 
 void
-gss_eap_shib_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id,
+gss_eap_shib_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
                                                   gss_any_t input) const
 {
     vector <Attribute *> *v = ((vector <Attribute *> *)input);
@@ -525,5 +525,7 @@ OM_uint32
 gssEapLocalAttrProviderFinalize(OM_uint32 *minor)
 {
     gss_eap_shib_attr_provider::finalize();
+
+    *minor = 0;
     return GSS_S_COMPLETE;
 }