Merge branch 'master' into tlv-mic

Conflicts:
	moonshot/mech_eap/authorize_localname.c

diff --combined moonshot/mech_eap/Makefile.am
index 93f51f1,ad26e56..e7e5f9f
--- 1/moonshot/mech_eap/Makefile.am
--- 2/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@@ -17,17 -17,17 +17,18 @@@ mech_eap_la_CXXFLAGS = -Werror -Wall -W
                        @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@
  
  mech_eap_la_SOURCES =                         \
        accept_sec_context.c                    \
+       authorize_localname.c                   \
        acquire_cred.c                          \
        acquire_cred_with_password.c            \
        add_cred.c                              \
        add_cred_with_password.c                \
 +      authorize_localname.c                   \
        canonicalize_name.c                     \
        compare_name.c                          \
        context_time.c                          \