Merge remote branch 'origin/master' into HEAD

Conflicts:
	moonshot/mech_eap/userok.c

diff --cc mech_eap/Makefile.am
index 0000000,51f2d84..93f51f1
mode 000000,100644..100644
--- /dev/null
--- 2/mech_eap/Makefile.am
+++ b/mech_eap/Makefile.am
@@@ -1,0 -1,130 +1,130 @@@
 -      userok.c                                \
+ AUTOMAKE_OPTIONS = foreign
+ 
+ gssincludedir = $(includedir)/gssapi
+ gssinclude_HEADERS = gssapi_eap.h
+ 
+ EAP_CFLAGS = -I$(srcdir)/../libeap/src -I$(srcdir)/../libeap/src/common -I$(srcdir)/../libeap/src/eap_common  \
+     -I$(srcdir)/../libeap/src/utils -DIEEE8021X_EAPOL
+ 
+ gssdir = $(libdir)/gss
+ gss_LTLIBRARIES = mech_eap.la
+ 
+ mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
+ mech_eap_la_CFLAGS   = -Werror -Wall -Wunused-parameter \
+                       @KRB5_CFLAGS@  @RADSEC_CFLAGS@ @TARGET_CFLAGS@ $(EAP_CFLAGS)
+ mech_eap_la_CXXFLAGS = -Werror -Wall -Wunused-parameter \
+                       @KRB5_CFLAGS@  @RADSEC_CFLAGS@ \
+                       @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@
+ 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                    \
+       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                          \
+       delete_name_attribute.c                 \
+       delete_sec_context.c                    \
+       display_name.c                          \
+       display_name_ext.c                      \
+       display_status.c                        \
+       duplicate_name.c                        \
+       eap_mech.c                              \
+       export_name.c                           \
+       export_name_composite.c                 \
+       export_sec_context.c                    \
+       get_mic.c                               \
+       get_name_attribute.c                    \
+       gsseap_err.c                            \
+       import_name.c                           \
+       import_sec_context.c                    \
+       indicate_mechs.c                        \
+       init_sec_context.c                      \
+       inquire_attrs_for_mech.c                \
+       inquire_context.c                       \
+       inquire_cred.c                          \
+       inquire_cred_by_oid.c                   \
+       inquire_mech_for_saslname.c             \
+       inquire_mechs_for_name.c                \
+       inquire_name.c                          \
+       inquire_names_for_mech.c                \
+       inquire_saslname_for_mech.c             \
+       inquire_sec_context_by_oid.c            \
+       map_name_to_any.c                       \
+       process_context_token.c                 \
+       pseudo_random.c                         \
+       radsec_err.c                            \
+       release_any_name_mapping.c              \
+       release_cred.c                          \
+       release_name.c                          \
+       release_oid.c                           \
+       set_name_attribute.c                    \
+       set_cred_option.c                       \
+       set_sec_context_option.c                \
+       store_cred.c                            \
+       unwrap.c                                \
+       unwrap_iov.c                            \
+       util_attr.cpp                           \
+       util_base64.c                           \
+       util_buffer.c                           \
+       util_context.c                          \
+       util_cksum.c                            \
+       util_cred.c                             \
+       util_crypt.c                            \
+       util_json.cpp                           \
+       util_krb.c                              \
+       util_lucid.c                            \
+       util_mech.c                             \
+       util_name.c                             \
+       util_oid.c                              \
+       util_ordering.c                         \
+       util_radius.cpp                         \
+       util_saml.cpp                           \
+       util_shib.cpp                           \
+       util_sm.c                               \
+       util_token.c                            \
+       verify_mic.c                            \
+       wrap.c                                  \
+       wrap_iov.c                              \
+       wrap_iov_length.c                       \
+       wrap_size_limit.c
+ 
+ BUILT_SOURCES = gsseap_err.c radsec_err.c
+ 
+ if GSSEAP_ENABLE_REAUTH
+ mech_eap_la_SOURCES += util_reauth.c
+ 
+ 
+ 
+ if !HEIMDAL
+ krb5pluginsdir = $(libdir)/krb5/plugins/authdata
+ krb5plugins_LTLIBRARIES = radius_ad.la
+ 
+ radius_ad_la_CFLAGS  = -Werror -Wall -Wunused-parameter \
+                       @KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
+ radius_ad_la_LDFLAGS = -avoid-version -module \
+                      -export-symbols radius_ad.exports -no-undefined
+ radius_ad_la_LIBADD  = @KRB5_LIBS@
+ radius_ad_la_SOURCES = util_adshim.c
+ endif
+ endif
+ 
+ gsseap_err.h gsseap_err.c: gsseap_err.et
+       $(COMPILE_ET) $<
+ 
+ radsec_err.h radsec_err.c: radsec_err.et
+       $(COMPILE_ET) $<
+ 
+ radsec_err.c: radsec_err.h
+ 
+ clean-generic:
+       rm -f gsseap_err.[ch] radsec_err.[ch]
+ 

diff --cc mech_eap/accept_sec_context.c
Simple merge

diff --cc mech_eap/export_sec_context.c
Simple merge

diff --cc mech_eap/gssapiP_eap.h
Simple merge

diff --cc mech_eap/import_sec_context.c
Simple merge

diff --cc mech_eap/init_sec_context.c
Simple merge

diff --cc mech_eap/inquire_name.c
Simple merge

diff --cc mech_eap/mech_eap.exports
Simple merge

diff --cc mech_eap/util.h
Simple merge

diff --cc mech_eap/util_attr.cpp
Simple merge

diff --cc mech_eap/util_context.c
Simple merge

diff --cc mech_eap/util_sm.c
Simple merge

diff --cc mech_eap/util_token.c
Simple merge