From: Russ Allbery <rra@debian.org>
Date: Wed, 15 Nov 2006 23:31:58 +0000 (+0000)
Subject: * Accept trailing whitespace in ThisCell.
X-Git-Tag: debian/1.4.2-3~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b2e6b2e36ecd35f736a9dd26a64aae6ec68ff0db;p=packages%2Fo%2Fopenafs.git

* Accept trailing whitespace in ThisCell.
---

diff --git a/debian/changelog b/debian/changelog
index 0a3fb8126..51c5ffbe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openafs (1.4.2-3) unstable; urgency=low
 
   * No longer pass explicit cache tuning options to afsd and instead let
     OpenAFS automatically choose tuning based on the cache size.
+  * Accept trailing whitespace in ThisCell.
   * Change the documentation of afsd -shutdown to be less dire and more
     accurate.  Thanks, Daniel J. Priem.  (Closes: #394990)
   * Document (at least partially) AFS's mapping of Kerberos v5 principal
@@ -9,7 +10,7 @@ openafs (1.4.2-3) unstable; urgency=low
     J. Priem.  (Closes: #394832)
   * Document that aklog -setpag may not always work.
 
- -- Russ Allbery <rra@debian.org>  Tue,  7 Nov 2006 16:41:56 -0800
+ -- Russ Allbery <rra@debian.org>  Wed, 15 Nov 2006 15:31:28 -0800
 
 openafs (1.4.2-2) unstable; urgency=low
 
diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index cc757a894..978720163 100644
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -492,6 +492,10 @@ GetCellUnix(struct afsconf_dir *adir)
     p = strchr(tbuffer, '\n');
     if (p)
 	*p = '\0';
+    p = tbuffer + strlen(tbuffer) - 1;
+    while (p > tbuffer && isspace(*p))
+	p--;
+    *p = '\0';
 
     adir->cellName = strdup(tbuffer);
     return 0;