From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 9 Oct 2008 13:58:39 +0000 (-0400)
Subject: mount.cifs: have uppercase_string return success on NULL pointer
X-Git-Tag: samba-4.0.0alpha6~769^2~228^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd9002cf498e177b769eabd2fed40213069cd239;p=thirdparty%2Fsamba.git

mount.cifs: have uppercase_string return success on NULL pointer

We currently don't attempt to uppercase the device portion of the mount
string if there isn't a prefixpath. Fix that by making uppercase_string
return success without doing anything on a NULL pointer.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index b7a76c61024..0c30216cd45 100644
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -996,12 +996,12 @@ static struct option longopts[] = {
 };
 
 /* convert a string to uppercase. return false if the string
- * wasn't ASCII or was a NULL ptr */
+ * wasn't ASCII. Return success on a NULL ptr */
 static int
 uppercase_string(char *string)
 {
 	if (!string)
-		return 0;
+		return 1;
 
 	while (*string) {
 		/* check for unicode */