summaryrefslogtreecommitdiff
path: root/cifs-utils/cifs-utils-5.9-got_user.patch
diff options
context:
space:
mode:
Diffstat (limited to 'cifs-utils/cifs-utils-5.9-got_user.patch')
-rw-r--r--cifs-utils/cifs-utils-5.9-got_user.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/cifs-utils/cifs-utils-5.9-got_user.patch b/cifs-utils/cifs-utils-5.9-got_user.patch
new file mode 100644
index 000000000..b6ac8917b
--- /dev/null
+++ b/cifs-utils/cifs-utils-5.9-got_user.patch
@@ -0,0 +1,29 @@
+commit 1a01f7c4b90695211d12291d7a24bec05b1f2922
+Author: Jeff Layton <jlayton@samba.org>
+Date: Sat Jan 12 22:02:01 2013 -0500
+
+ 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>
+
+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);

Generated by cgit