Merge branch 'master' into lukeh/acquire-cred-ex

2011-05-14 14:56:16 +02:00
parent d8ff5844f7 d1b553aae2
commit 3069d80734
224 changed files with 2134 additions and 2129 deletions
--- a/lib/gssapi/test_context.c
+++ b/lib/gssapi/test_context.c
@@ -553,8 +553,12 @@ main(int argc, char **argv)
    else
 	mechoid = string_to_oid(mech_string);

-    if (gsskrb5_acceptor_identity)
-	gsskrb5_register_acceptor_identity(gsskrb5_acceptor_identity);
+    if (gsskrb5_acceptor_identity) {
+	maj_stat = gsskrb5_register_acceptor_identity(gsskrb5_acceptor_identity);
+	if (maj_stat)
+	    errx(1, "gsskrb5_acceptor_identity: %s",
+		 gssapi_err(maj_stat, 0, GSS_C_NO_OID));
+    }

    if (client_password) {
 	credential_type = GSS_C_CRED_PASSWORD;