From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 28 Mar 2014 16:08:46 +0000 (+0100)
Subject: volser: fix spurious strcat of volume extension.
X-Git-Tag: upstream/1.6.10_pre1^2~150
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e6984f84d53115810e7936b8ee240b3a67789e56;p=packages%2Fo%2Fopenafs.git

volser: fix spurious strcat of volume extension.

Fix malformed merge error left over from
commit 4f9ec8396d1c7f12f8fa264cea7c255ce62b7b8d
where we converted strcat to strlcat.

Reviewed-on: http://gerrit.openafs.org/10963
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit e6110959e802bd9ae60e3724ba41078e7b335bab)

Change-Id: I3ac39245f9151f319ab5d5bb6b6d17dd13446ac1
Reviewed-on: http://gerrit.openafs.org/11039
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 8673850a8..b4b17e906 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -3084,11 +3084,6 @@ GetTrans(struct nvldbentry *vldbEntryPtr, afs_int32 index,
 	    goto fail;
 	}
 
-	if (tmpVolId)
-	    strcat(volname, ".roclone");
-	else
-	    strcat(volname, ".readonly");
-
 	if (verbose) {
 	    fprintf(STDOUT,
 		    "Creating new volume %lu on replication site %s: ",