]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
salvager: fix filesystem path truncation
authorMichael Meffie <mmeffie@sinenomine.net>
Tue, 20 Sep 2011 20:21:50 +0000 (16:21 -0400)
committerDerrick Brashear <shadow@dementix.org>
Wed, 28 Sep 2011 14:01:56 +0000 (07:01 -0700)
Fix filesystem path truncation for vice partitions beyond /vicepz.

Commit 3d7388b7 moved the filesystem path to a fixed size buffer,
however the path of the filesystem to be salvaged is truncated for
partitions with two character ids (e.g. /vicepaa), in which case
the salvager will salvager the wrong partition, or abort if the
truncated path is not present.

(cherry picked from commit 1e487f6026fb559638fab256362dbda9d4b4a8b1)

Change-Id: I1f69b580e4db59f9e8dc245348ede176fc1d23c1
Reviewed-on: http://gerrit.openafs.org/5474
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
src/vol/vol-salvage.c

index c794cfa6545e123d4e7db3351469cb90c6ae82f5..13ed71bb876a6349177b29f1c53d454182b239ce 100644 (file)
@@ -272,7 +272,7 @@ FILE *logFile = 0;  /* one of {/usr/afs/logs,/vice/file}/SalvageLog */
 struct SalvInfo {
     Device fileSysDevice;    /**< The device number of the current partition
                              *   being salvaged */
-    char fileSysPath[8];     /**< The path of the mounted partition currently
+    char fileSysPath[9];     /**< The path of the mounted partition currently
                               *   being salvaged, i.e. the directory containing
                               *   the volume headers */
     char *fileSysPathName;   /**< NT needs this to make name pretty log. */