Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am
index 1381a1e..ad26e56 100644 (file)
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@ -17,7 +17,7 @@ mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
                        @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
 mech_eap_la_LDFLAGS  = -avoid-version -module \
                        -export-symbols mech_eap.exports -no-undefined \
-                       @EAP_LDFLAGS@ @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
+                       @RADSEC_LDFLAGS@ @TARGET_LDFLAGS@
 mech_eap_la_LIBADD   = @KRB5_LIBS@ ../libeap/libeap.la @RADSEC_LIBS@ \
                       @SHIBRESOLVER_LIBS@ @SHIBSP_LIBS@ @JANSSON_LIBS@
 

diff --git a/moonshot/mech_eap/mech_eap.exports b/moonshot/mech_eap/mech_eap.exports
index 449f013..1613713 100644 (file)
--- a/moonshot/mech_eap/mech_eap.exports
+++ b/moonshot/mech_eap/mech_eap.exports
@@ -41,7 +41,6 @@ gss_set_sec_context_option
 gss_store_cred
 gss_unwrap
 gss_unwrap_iov
-gss_userok
 gss_verify_mic
 gss_wrap
 gss_wrap_iov
@@ -51,4 +50,5 @@ GSS_EAP_AES128_CTS_HMAC_SHA1_96_MECHANISM
 GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM
 GSS_EAP_NT_EAP_NAME
 gssspi_acquire_cred_with_password
+gssspi_authorize_localname
 gssspi_set_cred_option