rpms/pam_mysql/F-9 pam_mysql-0.7RC1-first-pass.patch, NONE, 1.1 pam_mysql.spec, 1.19, 1.20
Paul P Komkoff Jr
stingray at fedoraproject.org
Sun Nov 16 17:40:07 UTC 2008
Author: stingray
Update of /cvs/extras/rpms/pam_mysql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4685/F-9
Modified Files:
pam_mysql.spec
Added Files:
pam_mysql-0.7RC1-first-pass.patch
Log Message:
pam_mysql-0.7-0.6.rc1
pam_mysql-0.7RC1-first-pass.patch:
--- NEW FILE pam_mysql-0.7RC1-first-pass.patch ---
--- pam_mysql-0.7RC1/pam_mysql.c~ 2008-10-01 10:01:48.000000000 -0700
+++ pam_mysql-0.7RC1/pam_mysql.c 2008-10-01 16:07:07.000000000 -0700
@@ -3353,7 +3353,7 @@
case PAM_NO_MODULE_DATA:
passwd = NULL;
- break;
+ goto askpass;
default:
retval = PAM_AUTH_ERR;
@@ -3419,6 +3419,7 @@
}
}
+askpass:
switch (pam_mysql_converse(ctx, &resps, pamh, 1,
PAM_PROMPT_ECHO_OFF, PLEASE_ENTER_PASSWORD)) {
case PAM_MYSQL_ERR_SUCCESS:
@@ -3446,6 +3447,10 @@
goto out;
}
+ if (passwd_is_local) {
+ (void) pam_set_item(pamh, PAM_AUTHTOK, passwd);
+ }
+
switch (pam_mysql_open_db(ctx)) {
case PAM_MYSQL_ERR_BUSY:
case PAM_MYSQL_ERR_SUCCESS:
@@ -3464,10 +3469,6 @@
goto out;
}
- if (passwd_is_local) {
- (void) pam_set_item(pamh, PAM_AUTHTOK, passwd);
- }
-
err = pam_mysql_check_passwd(ctx, user, passwd,
!(flags & PAM_DISALLOW_NULL_AUTHTOK));
Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/F-9/pam_mysql.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pam_mysql.spec 20 Feb 2008 03:26:07 -0000 1.19
+++ pam_mysql.spec 16 Nov 2008 17:39:37 -0000 1.20
@@ -1,12 +1,13 @@
Summary: PAM module for auth UNIX users using MySQL data base
Name: pam_mysql
Version: 0.7
-Release: 0.5.rc1%{?dist}.2
+Release: 0.6.rc1%{?dist}
Epoch: 1
License: GPLv2+
Group: System Environment/Base
Source0: http://dl.sf.net/pam-mysql/%{name}-%{version}RC1.tar.gz
Patch0: pam_mysql-0.7RC1-resps-segfault.patch
+Patch1: pam_mysql-0.7RC1-first-pass.patch
URL: http://sf.net/projects/pam-mysql/
BuildRequires: pam-devel mysql-devel cyrus-sasl-devel pkgconfig openssl-devel
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -19,6 +20,7 @@
%prep
%setup -q -n %{name}-%{version}RC1
%patch0 -p1
+%patch1 -p1
%build
%configure \
@@ -47,6 +49,9 @@
/%{_lib}/security/pam_mysql.so
%changelog
+* Fri Oct 3 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.7-0.6.rc1
+- Fix bz#465186 (credits go to: Philippe Troin)
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.7-0.5.rc1.2
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list