Hello community, here is the log from the commit of package cifs-utils for openSUSE:Factory checked in at 2013-01-24 15:34:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cifs-utils (Old) and /work/SRC/openSUSE:Factory/.cifs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cifs-utils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cifs-utils/cifs-utils.changes 2013-01-20 14:35:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cifs-utils.new/cifs-utils.changes 2013-01-24 15:34:32.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 23 11:06:31 UTC 2013 - [email protected] + +- Set parsed_info->got_user when a cred file supplies a username; + (bnc#800018). + +------------------------------------------------------------------- New: ---- 1a01f7c4b90695211d12291d7a24bec05b1f2922.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cifs-utils.spec ++++++ --- /var/tmp/diff_new_pack.jd5mh2/_old 2013-01-24 15:34:35.000000000 +0100 +++ /var/tmp/diff_new_pack.jd5mh2/_new 2013-01-24 15:34:35.000000000 +0100 @@ -27,6 +27,7 @@ Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh +Patch: 1a01f7c4b90695211d12291d7a24bec05b1f2922.diff %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -82,6 +83,7 @@ %prep %setup -q +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie" ++++++ 1a01f7c4b90695211d12291d7a24bec05b1f2922.diff ++++++ commit 1a01f7c4b90695211d12291d7a24bec05b1f2922 Author: Jeff Layton <[email protected]> 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." <[email protected]> Signed-off-by: Jeff Layton <[email protected]> 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
