Mounting with credentials file fixed (bug #459040)

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 62 insertions, 17 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index 307b2b0f1b23..dcd50c4a511e 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.49 2013/02/22 15:08:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.50 2013/02/25 12:07:15 polynomial-c Exp $
+
+*cifs-utils-5.9-r1 (25 Feb 2013)
+
+  25 Feb 2013; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-5.9.ebuild,
+  +cifs-utils-5.9-r1.ebuild,
+  +files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch:
+  Mounting with credentials file fixed. Thanks to Michael Buchfink for
+  reporting this in bug #459040.
 
 *cifs-utils-5.9 (22 Feb 2013)
 
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 0756c946bf5c..adfa2edd1fa4 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA256
 
 AUX cifs-utils-5.5-initialize_rc_var_properly.patch 1033 SHA256 c341bd479fd4e1587bf53db3e525b60f25368ba2860977235a64fa3988671ec9 SHA512 a81a7f36a11d43bdd1b08ed95aa87db1d6f4143a5f172aec1692d089cb4a8e0d0ab7b12a7cedd132182debe2e757c497a7840f3e7003467747712e2d1964617d WHIRLPOOL 157dc9c5939c4f2e4c1f399bb63a4a803af4727ad73df3117a7f674083bd17ba7df22810f6ebc771425010fbda7866b3f818b41d2a468b50d3ad0c15c34ab2da
+AUX cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch 1165 SHA256 b501c3a0665df177ea3faa682db98a559c736eddb2ef2eb91746ecedc60f8100 SHA512 a479ed28f9266bb0b2ef416d442c37d818c9ed7f141467c28c67e03cc27366cf5f75a8ed7ad8380407419981efa8d40bb8722b50a28bcfedade692d4d95918d8 WHIRLPOOL 91ee78b340e4d76fd3e98130db50599714a8042270df660650b54032e90a39c986f8050f9e7c21551360487b2e3114e759c5f6cdd58e1d68d4039f1c6fdacaf7
 DIST cifs-utils-5.6.tar.bz2 381098 SHA256 f1501a26a800a336baf53ba0ea383274361c86c4b50ec45c656b9810b84dc138 SHA512 dcf4fff6d55453a144e94af6606e33e86b2612aa03766d6b4f0a352ed3ac0032708e42d36ddf8efe4bf7f9288d9a64b4d1e5fd7068b59194e1caf7778df25d08 WHIRLPOOL cd361d071e8d14d4b92508a86bb497598850efcaab32fcfcc7a60e9a4bbed7efc33279c31b92cd2fec574b58fc9a552f1a11ba471358bbd52235697acd72d971
 DIST cifs-utils-5.8.tar.bz2 383272 SHA256 aae107f4d7f39b9374e2a60a48796c5c7b5c88bf0a5e0281799aff2345e51e82 SHA512 32b1094f4c5dd6d93c0d3a6c00ea29e52b82c82582378a228b8a68ff0ed50fdfcef6019641ccabc3a666452bd97393ecca4355e3370d2d0b7287109ed7f34c3b WHIRLPOOL 29f6d74a21ca77e39bf0d9b27b177eae27d33684ed383303996ece32a69a49cba92aa3dcd2e700c9fff471543d6e4b7804135145208d2336b84df7e88ec135e3
 DIST cifs-utils-5.9.tar.bz2 388403 SHA256 ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2 SHA512 c4d789c6dce2c0927ccc9359147c12151ea9a688bc376c1df21deec66a98669dc4fb6dd8e26d549475d0bbe1e5449ce08fb86e45c765eee7013ec2040c23600e WHIRLPOOL ef4c9b23b2e12a53d936acd19ce10fbe347279ee3c2914a2cbe26d101898bad22606c622ca005af68e0c44605c4137b3633691171387e269caf06542919cec90
 EBUILD cifs-utils-5.6-r1.ebuild 2241 SHA256 b9e1f2c8566f0019bbd4cbe16fc1f59949085d411bcb9dd6e3be734eef865ffd SHA512 794b054724de4000a708f990da0fb5e22664afabd97f959451ecf718d9d70b12c751baaf8ac83da6ea8bac224c201c8bdae1427a1551de8bf1aef93162e5a67f WHIRLPOOL 55f335e49bd330a465452a0878583f663e98fcdf442775e520e5f0cef10673f06921fe6ef8dbc42022d3cd39830ca08419ef37ca81959007174346fff6e307a6
 EBUILD cifs-utils-5.8-r1.ebuild 2422 SHA256 0c757b7e52494f0971d9f1299dce4ab3659d555024f3710f91df1e448cf4f885 SHA512 ed0bc7fe00ef49dc6f4bd80226f02137968229029778eea8f93083924185c19a11e039d869286d1573407ad70dafb4df61eb8d578d7a21052d1a6bd799fe19c1 WHIRLPOOL 7844050d7278a526a7fa9ae50842deb218111c75ff316a9b130a1384cd5afbeb693ea1600bd1545c6bb2bd6e786f765a13175413d476f6d4db9e342e6b17bdac
-EBUILD cifs-utils-5.9.ebuild 2482 SHA256 f2c05a56cbe65367d165be72cd70425a98cbdddfdec9bb5217c9a8bf30fab0d4 SHA512 aabde8415d9d936a10190e946f3c3d57e9adaece3aa5d83f9c44c1254e11a8b317f4bc4fbffdff8d2d24e12524b8aa29e84a0aaf2c9c60aef5cfadc782ab556a WHIRLPOOL f214d8cea06c90882766890c881e4f5a312eecd604588709ec7b43c72b637db7e95094b65f82559542af381917625e0c032ce506334a1b4228a960bd9ac34e81
-MISC ChangeLog 7423 SHA256 97f6de75a76b11be85970ba196cf8facd6d294fca6c7132abc1570c4b2fbedcc SHA512 1ab3d5d7fa8ce7dfc3850193401b60c3a76c44fae8b7b056f33ea9209a5aedb52357317004386134e75069c357c9643f28ccb1d5d08334fa7829633ab65ca918 WHIRLPOOL 618a32bfbca65cb7b7e96b97321b3cf9360bdf57bc6b5ed0af57a62757d3cc4104f02a18056db5e7e65d0c0761551add6753cd50c4da747cd8d6e19209fabbf1
+EBUILD cifs-utils-5.9-r1.ebuild 2594 SHA256 b309b8c764929ca41317f7ca6d16cba0da3e7ed0b9cf0d4a27e7c1ca13012051 SHA512 c9c15fec71cde824560038ba3cbad2786435983f25d46fdf12424b9c7381d61f3c840ea9cf3d54786929f111c2c5bfd101b745eb7a78fcf8ff9d1943cc9d9bd1 WHIRLPOOL 7480f906c28d22976161b123ed00e83ecfecd51d8eba49c52b0fd9060d5e5a4e35f3502de0caa59197aacccbf16d72eed92bb99ae7272497ce9381e3e1f92e55
+MISC ChangeLog 7742 SHA256 c8b8643a726b19e32aeb0a11d17de2a0cd3e4bd0fe6cabc473f3ca4f0721f254 SHA512 65ee46a4bf2bea0c38a300835b2c86b0623eebab1d1624f3f9f552263cc0892deb288adb31a57075d8256bbef49a668e5520f285dc87e264979007d6ac285c64 WHIRLPOOL 79b691e60e6e726b5ff438f30d177d6e595853ce869a0b5a33c2edc42171d39a52c21e3acd39b8f3eefe12e14de342d9b5e1c224134e8154f814929be87eb0fc
 MISC metadata.xml 918 SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9 SHA512 cc02e740b458ddea020545a60ad8689027d3380fdceb64b50a8e120aad7c3293368aff072eae69e2892fab1e0a2d665b8292eb665ae55bc289f2d71999fba7ec WHIRLPOOL ba3913f7a3a782b8a7674e613e147f2bc8dee7e84c658d01214c9fb05be995da2cb797d292cf965d81da9bf0e03b53a007440df8c1a401365dfbc9832042f343
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIbBAEBCAAGBQJRJ4n2AAoJEPiazRVxLXTFeQAP+Icz7DuNMxv092QoV4MNj204
-FUIHHtmdQe03c1We1+eKTHHm0qHBUBKlA+7omUHFNZehamvWbfIz2Q5WT+kbSdy6
-rVB/+aYyX0czKaqNJnXN5SAExxUH6DHXiei6NccgGZBAjud+t6f0y7dHOqzRh4/L
-deDDeLhIcKUUkx2BfbzKL0oB/2sOUbHpvCutD6FhHzUWe87X8TsiKTMDveCEKClr
-hZY7ZTxEK5oASOD/Wow5j3/uF2jIFRuavl3Fn4GJH9EVj3ZTavxMoL50W6y51BvP
-2G+0fSsrWCSROPgOHHIkFEC28EnvW133Ywk95Q6JCRFOyD8J0ihmsyuhoq+ahsdA
-WMGYr4rctFM6sAxkDvGVNdCvaTkGNFV8QajzZG8R0rTiLiouJ0c4TCMfE+N7b/7n
-Fty0gu4y9av8gXK5EhZmdvD3PUF+sFNNp2bG5sPLxcwhydGMimw6vWrBFKgbTclA
-dT+OEjbQH7hagveKOPzcF4CUBL2fEKnUfxapJqzLCI+/HnFSOhWiF0Ues26TrxK6
-9uFZOjQivTcsQ+UR7TABkY7jCiBzykUbcm6zCR0nKONKhS+LYs7V1G8kDhRPBGaL
-Ogs2C44fERo1g91czZ1uGaDZaAPqsnEhanH+durXMdm0zTEpLCR9I65zCpW+hVcP
-r7B/g3cjNpT+L7Nxx8k=
-=mq5l
+iQIcBAEBCAAGBQJRK1P0AAoJEPiazRVxLXTFid0QANFkfLJ10vyF/3Q7Jc2X5n7x
+ljjEnoI7fdYz21zSGRUdWQa36p8+r96eq7nai4GjbPvZ66vhetG3FbQgXvRr0tfp
+6YrDz2yx8tmDtyGhWKqaoKQl94z0TxrE667rdJXEz1HamiqEjgtls2eEGGMwUZT4
+7eOJqTWyMxjgt/gCAt7lNil6cHA/KQ1J8zCZwZAcDivijNFiBYQrfyGHn+wSl2D6
+WjjRXQ/dLsG5G4e6KO54wTEb3gnvF/W5XJgGN1gHqlZcvTV7zh46Hrgbn7JnQXYK
+w7UGXnNy+3auuXr435ZCwUQ+2JiFwR5xy8UIxlZFl1y5MUdrzs1IjCVqCYoRB2uV
+qo3g0+yUVIg1wK+O3MnGf3VOTTjUZhKeJlcpLZmkA+9xc+U1Ljz/zoYALgAnu+Ly
+fBDAgWypVgWyvK/r2VASnjR4N/CvOWu+p+/k1zAEkro5n1t4Hk/BLRMfUoAtgDV8
+mYyRt8UHrrKpUKh6s0PlBqYcn39Anm1U5so4u1qH8EF8kx4ni/C1l5tIOikcK0I/
+Bv69PG4b0xSd+cdLbE3v4YK9jtX3TkssoFSssbOdNASkNQ4jvwKMglkUXSnHeocr
+Pg0Mmd2+x5aw8g69tSZY949+bcEPABO0E71FQFUER3Bl7ZcsWlDj59XhlXAJcI2v
+FkfxuDG7OzGMEDoPMVS7
+=QHHX
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.9.ebuild b/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild
index 1bfa32bef905..00ca978148ad 100644
--- a/net-fs/cifs-utils/cifs-utils-5.9.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.9.ebuild,v 1.1 2013/02/22 15:08:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild,v 1.1 2013/02/25 12:07:15 polynomial-c Exp $
 
 EAPI=4
 
@@ -44,6 +44,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# bug #459040
+	epatch "${FILESDIR}"/${P}-set-parsed_info-got_user-when-a-cred-file.patch
+}
+
 src_configure() {
 	ROOTSBINDIR="${EPREFIX}"/sbin \
 	econf \
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch b/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch
new file mode 100644
index 000000000000..d06ae015d038
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch
@@ -0,0 +1,31 @@
+From: Jeff Layton <jlayton@samba.org>
+Date: Sun, 13 Jan 2013 03:02:01 +0000 (-0500)
+Subject: mount.cifs: set parsed_info->got_user when a cred file supplies a username
+X-Git-Url: https://gitweb.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=1a01f7c4b90695211d12291d7a24bec05b1f2922
+
+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);