From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 25 Feb 2008 05:00:16 +0000 (+0000)
Subject: DEVEL15-nulluuid-check-only-valid-input-20080224
X-Git-Tag: openafs-devel-1_5_33~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e1e36603360a88583e283941ba88612f10740894;p=packages%2Fo%2Fopenafs.git

DEVEL15-nulluuid-check-only-valid-input-20080224

LICENSE IPL10

as reported by jhutz@cmu.edu


(cherry picked from commit 27dc7b13aa6356ba76916e47c6ddb48aa4b99846)
---

diff --git a/src/viced/host.c b/src/viced/host.c
index 54f498250..58dfbf103 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -1485,7 +1485,7 @@ h_GetHost_r(struct rx_connection *tcon)
 	cb_conn=NULL;
 	H_LOCK;
 	if ((code == RXGEN_OPCODE) || 
-	    (afs_uuid_equal(&interf.uuid, &nulluuid))) {
+	    ((code == 0) && (afs_uuid_equal(&interf.uuid, &nulluuid)))) {
 	    identP = (struct Identity *)malloc(sizeof(struct Identity));
 	    if (!identP) {
 		ViceLog(0, ("Failed malloc in h_GetHost_r\n"));
@@ -1617,7 +1617,7 @@ h_GetHost_r(struct rx_connection *tcon)
 	    cb_conn=NULL;
 	    H_LOCK;
 	    if ((code == RXGEN_OPCODE) || 
-		afs_uuid_equal(&interf.uuid, &nulluuid)) {
+		((code == 0) && (afs_uuid_equal(&interf.uuid, &nulluuid)))) {
 		if (!identP)
 		    identP =
 			(struct Identity *)malloc(sizeof(struct Identity));