From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 1 Mar 2011 21:43:10 +0000 (-0500)
Subject: tweak uvldb-making function
X-Git-Tag: upstream/1.8.0_pre1^2~4122
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=89ae0b12f20eea8a8b0a3fe493dc52d2def436ce;p=packages%2Fo%2Fopenafs.git

tweak uvldb-making function

in order to properly simulate a uvldb, swap in the right fields,
and mark it correctly.

Change-Id: I143784c0ca137e36ce6f7eddb54db3d9ac85bd37
Reviewed-on: http://gerrit.openafs.org/4107
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 33ecefce6..e6cfb7927 100644
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -198,9 +198,10 @@ nvlentry_to_uvlentry(struct nvldbentry *nentryp,
                                &uentryp->serverNumber[i],
                                &m_uniq, &m_nentries,
                                &m_addrs);
-	uentryp->serverUnique[i] = nentryp->serverNumber[i];
+	uentryp->serverUnique[i] = m_uniq;
 	uentryp->serverPartition[i] = nentryp->serverPartition[i];
 	uentryp->serverFlags[i] = nentryp->serverFlags[i];
+	uentryp->serverFlags[i] |= VLSERVER_FLAG_UUID;
     }
     uentryp->nServers = nentryp->nServers;
     for (i = 0; i < MAXTYPES; i++)