From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sun, 14 Jul 2013 01:29:19 +0000 (-0400)
Subject: Windows: fix cm_ServerEqual bug
X-Git-Tag: upstream/1.8.0_pre1^2~1061
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b5df669801b8406dacd5d16b25d4f01a14a473f1;p=packages%2Fo%2Fopenafs.git

Windows: fix cm_ServerEqual bug

must check svr2 not svr1 in the second uuid check.

Change-Id: I570b06c630a18c31001b3ca3ab09c870c7cbc355
Reviewed-on: http://gerrit.openafs.org/10086
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/cm_server.c b/src/WINNT/afsd/cm_server.c
index 1135973d5..a26375523 100644
--- a/src/WINNT/afsd/cm_server.c
+++ b/src/WINNT/afsd/cm_server.c
@@ -1629,7 +1629,7 @@ int cm_ServerEqual(cm_server_t *srv1, cm_server_t *srv2)
         if (UuidEqual((UUID *)&srv1->uuid, (UUID *)&srv2->uuid, &status))
             return 1;
     } else {
-        if (srv1->flags & CM_SERVERFLAG_UUID)
+        if (srv2->flags & CM_SERVERFLAG_UUID)
             return 0;
 
         /* Neither support UUID so perform an addr/port comparison */