svn rev #21612: branches/mskrb-integ/src/lib/gssapi/spnego/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21612
Commit By: lhoward
Log Message:
Improve error handling



Changed Files:
U   branches/mskrb-integ/src/lib/gssapi/spnego/spnego_mech.c
Modified: branches/mskrb-integ/src/lib/gssapi/spnego/spnego_mech.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/spnego/spnego_mech.c	2008-12-28 00:02:10 UTC (rev 21611)
+++ branches/mskrb-integ/src/lib/gssapi/spnego/spnego_mech.c	2008-12-28 00:09:53 UTC (rev 21612)
@@ -942,7 +942,6 @@
 					      req_flags,
 					      &mechtok_out, send_token,
 					      output_token) < 0) {
-
 			ret = GSS_S_FAILURE;
 		}
 	} else if (send_token != NO_TOKEN_SEND) {
@@ -1040,7 +1039,7 @@
 	      gss_cred_id_t cred, gss_buffer_t *outbuf)
 {
 	gss_buffer_desc hintNameBuf;
-	gss_name_t hintName;
+	gss_name_t hintName = GSS_C_NO_NAME;
 	gss_name_t hintKerberosName;
 	gss_OID hintNameType;
 	OM_uint32 major_status;
@@ -1062,7 +1061,9 @@
 						NULL);
 		if (major_status != GSS_S_COMPLETE)
 			return (major_status);
-	} else {
+	}
+
+	if (hintName == GSS_C_NO_NAME) {
 		krb5_error_code code;
 		krb5int_access kaccess;
 		char hostname[HOST_PREFIX_LEN + MAXHOSTNAMELEN + 1] = HOST_PREFIX;
@@ -1215,6 +1216,7 @@
 
 	ret = make_NegHints(minor_status, cred, mechListMIC);
 	if (ret != GSS_S_COMPLETE) {
+		*return_token = NO_TOKEN_SEND;
 		goto cleanup;
 	}
 
@@ -1555,7 +1557,7 @@
 			    OM_uint32 *time_rec,
 			    gss_cred_id_t *delegated_cred_handle)
 {
-	OM_uint32 ret, tmpret, tmpmin, negState;
+	OM_uint32 ret, tmpmin, negState;
 	send_token_flag return_token;
 	gss_buffer_t mechtok_in, mic_in, mic_out;
 	gss_buffer_desc mechtok_out = GSS_C_EMPTY_BUFFER;
@@ -1652,6 +1654,10 @@
 cleanup:
 	if (return_token != NO_TOKEN_SEND && return_token != CHECK_MIC) {
 		/* For acceptor-sends-first send a tokenInit */
+		int tmpret;
+
+		assert(sc != NULL);
+
 		if (sendTokenInit) {
 			tmpret = make_spnego_tokenInit_msg(sc,
 							   1,
@@ -1666,9 +1672,8 @@
 							   return_token,
 							   output_token);
 		}
-		if (tmpret != GSS_S_COMPLETE) {
-			ret = tmpret;
-		}
+		if (tmpret < 0)
+			ret = GSS_S_FAILURE;
 	}
 	if (ret == GSS_S_COMPLETE) {
 		*context_handle = (gss_ctx_id_t)sc->ctx_handle;