summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2008-10-09 09:58:39 -0400
committerJeff Layton <jlayton@redhat.com>2008-10-09 09:58:39 -0400
commitdd9002cf498e177b769eabd2fed40213069cd239 (patch)
tree582e581714222c8a235c8666c60f291ec856a215
parenteb78e5c46f2ceb1de9cdd459f024d0632ef90893 (diff)
downloadsamba-dd9002cf498e177b769eabd2fed40213069cd239.tar.gz
samba-dd9002cf498e177b769eabd2fed40213069cd239.tar.bz2
samba-dd9002cf498e177b769eabd2fed40213069cd239.zip
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>
-rw-r--r--source3/client/mount.cifs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index b7a76c6102..0c30216cd4 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 */