From: Sam Hartman <hartmans@painless-security.com>
Date: Mon, 5 Dec 2011 19:09:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into debian
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=a4f29f7431ef2f042e981fb1e5340639cd30e20f;p=moonshot.git

Merge remote-tracking branch 'origin/master' into debian

Conflicts:
	.gitmodules
	cyrus-sasl
	libradsec
	mod_auth_kerb
	moonshot/.gitignore
	moonshot/libeap
	moonshot/mech_eap/init_sec_context.c
	moonshot/mech_eap/unwrap_iov.c
	shibboleth/opensaml2
	shibboleth/resolver
	shibboleth/sp
---

a4f29f7431ef2f042e981fb1e5340639cd30e20f
diff --cc libradsec
index ed87c38,ccf7d90..b35d18a
--- a/libradsec
+++ b/libradsec
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit ed87c383a68a6ff2d43b48b39ab1b07cb2210d3d
 -Subproject commit ccf7d904d87c9097cee7471445e4a09876cb051a
++Subproject commit b35d18a6317a4946b7b123b7dfd536158e5081dd
diff --cc moonshot/.gitignore
index 69dca4f,57a94cd..7a693ee
--- a/moonshot/.gitignore
+++ b/moonshot/.gitignore
@@@ -1,2 -1,14 +1,3 @@@
 -Makefile.in
 -aclocal.m4
  autom4te.cache
- 
 -configure
 -config.*
 -ltmain.sh
 -libtool
 -depcomp
 -m4
 -!m4/minuso.m4
 -build-aux
 -!build-aux/compile
+ mech_eap.spec
+ mech_eap*tar*
diff --cc moonshot/libeap
index a7cc967,3c68005..2ded56e
--- a/moonshot/libeap
+++ b/moonshot/libeap
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a7cc9675085b48b8933a96c32bd1e772e1c7a565
 -Subproject commit 3c6800594dbfcba5d36cfa5556288eae999f83ba
++Subproject commit 2ded56e2cb1ff52d09602073f8daf2b6df7482ba
diff --cc moonshot/mech_eap/display_status.c
index 4b80d17,fc0d1ab..ef28e76
--- a/moonshot/mech_eap/display_status.c
+++ b/moonshot/mech_eap/display_status.c
@@@ -132,9 -137,9 +137,11 @@@ gssEapSaveStatusInfo(OM_uint32 minor, c
      if (format != NULL) {
          va_start(ap, format);
          n = vasprintf(&s, format, ap);
+         if (n == -1)
+             s = NULL;
          va_end(ap);
 +	if (n == -1)
 +	  s = NULL;
      }
  
      saveStatusInfoNoCopy(minor, s);
diff --cc shibboleth/opensaml2
index 2da7444,e94e023..09f67dd
--- a/shibboleth/opensaml2
+++ b/shibboleth/opensaml2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2da7444ecb963a45d0eeb98a41e1532f6cc4c19b
 -Subproject commit e94e023141ac016c2326f828b05ecc18e3ff469a
++Subproject commit 09f67dd916b3f4f4b2b31d1fa7bd63f4a4e027f4
diff --cc shibboleth/resolver
index 2c57c43,a1027dc..4efcb74
--- a/shibboleth/resolver
+++ b/shibboleth/resolver
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2c57c433b4b96c94c0291d6b5e4d534cea5b6fe1
 -Subproject commit a1027dcd31920baeb3471e4d7923845251ee0556
++Subproject commit 4efcb740f55f974db739457da340c6adac29c652
diff --cc shibboleth/sp
index 4d71b0b,fbb974e..80db697
--- a/shibboleth/sp
+++ b/shibboleth/sp
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4d71b0b2f8f0ef6093b383ad9102ec6eec51a090
 -Subproject commit fbb974ea644ce2778adcf9cdd6592ac20a343755
++Subproject commit 80db697dccef157a81a55328130371b99c916a18