packages: pam/pam-cracklib-enforce.patch, pam/pam.spec - updated to 1.1.1

[baggins]

Author: baggins                      Date: Thu Apr 29 10:28:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.1.1

---- Files affected:
packages/pam:
   pam-cracklib-enforce.patch (1.4 -> 1.5) , pam.spec (1.301 -> 1.302) 

---- Diffs:

================================================================
Index: packages/pam/pam-cracklib-enforce.patch
diff -u packages/pam/pam-cracklib-enforce.patch:1.4 packages/pam/pam-cracklib-enforce.patch:1.5
--- packages/pam/pam-cracklib-enforce.patch:1.4	Mon Sep  7 13:41:46 2009
+++ packages/pam/pam-cracklib-enforce.patch	Thu Apr 29 12:27:56 2010
@@ -100,13 +100,14 @@
      options.cracklib_dictpath = CRACKLIB_DICTS;
  
      ctrl = _pam_parse(pamh, &options, argc, argv);
-@@ -613,11 +628,26 @@
+@@ -613,12 +628,31 @@
  	    if (ctrl & PAM_DEBUG_ARG)
  	      pam_syslog(pamh,LOG_DEBUG,"bad password: %s",crack_msg);
  	    pam_error (pamh, _("BAD PASSWORD: %s"), crack_msg);
 -	    if (getuid() || (flags & PAM_CHANGE_EXPIRED_AUTHTOK))
 +	    if (flags & PAM_CHANGE_EXPIRED_AUTHTOK)
 	      {
+ 		pam_set_item (pamh, PAM_AUTHTOK, NULL);
 		retval = PAM_AUTHTOK_ERR;
 		continue;
 	      }
@@ -115,11 +116,15 @@
 +				retval = PAM_SUCCESS;
 +				break;
 +			case ENFORCE_USERS:
-+				if (getuid()) retval = PAM_AUTHTOK_ERR;
++				if (getuid()) {
++					pam_set_item (pamh, PAM_AUTHTOK, NULL);
++					retval = PAM_AUTHTOK_ERR;
++				}
 +				else retval = PAM_SUCCESS;
 +				break;
 +			case ENFORCE_ALL:
 +			default:
++				pam_set_item (pamh, PAM_AUTHTOK, NULL);
 +				retval = PAM_AUTHTOK_ERR;
 +				break;
 +		}
@@ -128,13 +133,14 @@
  	  }
  
  	  /* check it for strength too... */
-@@ -624,11 +650,26 @@
+@@ -624,12 +650,31 @@
  	  retval = _pam_unix_approve_pass (pamh, ctrl, &options,
  					   oldtoken, newtoken);
  	  if (retval != PAM_SUCCESS) {
 -	    if (getuid() || (flags & PAM_CHANGE_EXPIRED_AUTHTOK))
 +	    if (flags & PAM_CHANGE_EXPIRED_AUTHTOK)
  	      {
+ 		pam_set_item(pamh, PAM_AUTHTOK, NULL);
  		retval = PAM_AUTHTOK_ERR;
  		continue;
  	      }
@@ -143,11 +149,15 @@
 +				retval = PAM_SUCCESS;
 +				break;
 +			case ENFORCE_USERS:
-+				if (getuid()) retval = PAM_AUTHTOK_ERR;
++				if (getuid()) {
++					pam_set_item(pamh, PAM_AUTHTOK, NULL);
++					retval = PAM_AUTHTOK_ERR;
++				}
 +				else retval = PAM_SUCCESS;
 +				break;
 +			case ENFORCE_ALL:
 +			default:
++				pam_set_item(pamh, PAM_AUTHTOK, NULL);
 +				retval = PAM_AUTHTOK_ERR;
 +				break;
 +		}

================================================================
Index: packages/pam/pam.spec
diff -u packages/pam/pam.spec:1.301 packages/pam/pam.spec:1.302
--- packages/pam/pam.spec:1.301	Thu Mar 18 09:36:32 2010
+++ packages/pam/pam.spec	Thu Apr 29 12:27:56 2010
@@ -20,15 +20,15 @@
 Summary(tr.UTF-8):	Modüler, artımsal doğrulama birimleri
 Summary(uk.UTF-8):	Інструмент, що забезпечує аутентифікацію для програм
 Name:		pam
-Version:	1.1.0
-Release:	4
+Version:	1.1.1
+Release:	0.1
 Epoch:		1
 License:	GPL or BSD
 Group:		Base
 Source0:	http://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2
-# Source0-md5:	9cda791c827dfcd9f2888caf0a64cc4a
+# Source0-md5:	9b3d952b173d5b9836cbc7e8de108bee
 Source1:	http://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign
-# Source1-md5:	eedcd01bf8e722be4e6c8e16b5f1dce5
+# Source1-md5:	2c722d4b722cf87816ce231f67194a06
 Source2:	ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{pam_pld_version}.tar.gz
 # Source2-md5:	982169260efd9bdd9a74323c3f232e6f
 Source3:	other.pamd
@@ -531,6 +531,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.302  2010/04/29 10:27:56  baggins
+- updated to 1.1.1
+
 Revision 1.301  2010/03/18 08:36:32  jajcus
 - audit bcond fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pam/pam-cracklib-enforce.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pam/pam.spec?r1=1.301&r2=1.302&f=u