From: Kevin Coffman <kwc@citi.umich.edu>
Date: Tue, 20 Mar 2007 22:52:17 +0000 (-0400)
Subject: Fix a couple of problems that crept into mount
X-Git-Tag: nfs-utils-1-1-0-rc1~21
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=0ec44a497a508fb631d472ce8c33041c497e1ca5;hp=fc023f58a146bca6e67b26878ff35f2368b19f58

Fix a couple of problems that crept into mount

Commit 6facb22402a0bd8cd49be2ed1a0856b24fef42f4 changed the allocation
of len to no longer get 20 extra bytes.  It needs to get at least one
extra byte for a null character, otherwise a single extra option such
as "sec=krb5" is never copied in parse_opt() and is dropped.

Commit 44a3727a3243e674a1f1fdad5cbbc639aa25d01c added a typo when
checking the program name.

Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 487c0a6..b367b64 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -262,7 +262,7 @@ static void parse_opts (const char *options, int *flags, char **extra_opts)
 	if (options != NULL) {
 		char *opts = xstrdup(options);
 		char *opt, *p;
-		int len = strlen(opts);
+		int len = strlen(opts) + 1;		/* include room for a null */
 		int open_quote = 0;
 
 		*extra_opts = xmalloc(len);
@@ -437,7 +437,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (strcmp(progname, "mount.nfsv4") == 0)
+	if (strcmp(progname, "mount.nfs4") == 0)
 		nfs_mount_vers = 4;
 
 	if (uid != 0) {