tweak uvldb-making function

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

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>
(cherry picked from commit 89ae0b12f20eea8a8b0a3fe493dc52d2def436ce)

Change-Id: I0f0d0d2676d49eb33d7eadd3b7616e16e1e9002f
Reviewed-on: http://gerrit.openafs.org/4113
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index e3066827dd52c43a91858affca699471e16cdd93..98b33c0969d6d177f01fe89044841028fe2a108c 100644 (file)
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -197,9 +197,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++)