From: Derrick Brashear <shadow@your-file-system.com>
Date: Thu, 7 Mar 2013 11:53:16 +0000 (-0500)
Subject: afscp: null-terminate root.cell dir if needed in dynroot mode
X-Git-Tag: upstream/1.6.3^2~60
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=88c6a183de3e99ce386e8ee4f47b449e7c53c2e9;p=packages%2Fo%2Fopenafs.git

afscp: null-terminate root.cell dir if needed in dynroot mode

instead of doing a check for something which will never be true,
and then terminating, just terminate if it's not already
null-terminated.

Reviewed-on: http://gerrit.openafs.org/9439
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chaskiel Grundman <cg2v@andrew.cmu.edu>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit ceac74a6baad79155adaa692639b1d9f403525b6)

Change-Id: I14d3de25bca5b1ba1878048aac1973518f8c2359
Reviewed-on: http://gerrit.openafs.org/9583
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/libafscp/afscp_dir.c b/src/libafscp/afscp_dir.c
index 5233c156a..513a78388 100644
--- a/src/libafscp/afscp_dir.c
+++ b/src/libafscp/afscp_dir.c
@@ -373,11 +373,8 @@ gettoproot(struct afscp_cell *cell, char *p, char **q,
 	    r = p;
 	    while (*r && *r != '/')
 		r++;
-	    if (!*r && !p) {
-		afscp_errno = ENODEV;
-		return 1;
-	    }
-	    *r++ = 0;
+	    if (*r)
+		*r++ = 0;
 	    *q = r;
 	    afs_dprintf(("gettoproot: dynroot looking up cell %s\n", p));
 	    cell = afscp_CellByName(p, NULL);