36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 1a01f7c4b90695211d12291d7a24bec05b1f2922 Mon Sep 17 00:00:00 2001
|
|
From: Jeff Layton <jlayton@samba.org>
|
|
Date: Sat, 12 Jan 2013 22:02:01 -0500
|
|
Subject: [PATCH] mount.cifs: set parsed_info->got_user when a cred file
|
|
supplies a username
|
|
|
|
commit 85d18a1ed introduced a regression when using a credentials file.
|
|
It set the username in the parsed mount info properly, but didn't set
|
|
the "got_user" flag in it.
|
|
|
|
Also, fix an incorrect strlcpy length specifier in open_cred_file.
|
|
|
|
Reported-by: "Mantas M." <grawity@gmail.com>
|
|
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
|
---
|
|
mount.cifs.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/mount.cifs.c b/mount.cifs.c
|
|
index c7c3055..40b77e9 100644
|
|
--- a/mount.cifs.c
|
|
+++ b/mount.cifs.c
|
|
@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
|
|
switch (parse_cred_line(line_buf + i, &temp_val)) {
|
|
case CRED_USER:
|
|
strlcpy(parsed_info->username, temp_val,
|
|
- sizeof(parsed_info->domain));
|
|
+ sizeof(parsed_info->username));
|
|
+ parsed_info->got_user = 1;
|
|
break;
|
|
case CRED_PASS:
|
|
i = set_password(parsed_info, temp_val);
|
|
--
|
|
1.7.11.7
|
|
|