From 0591e4b1124351f76a07ae5814e39d1096d20f579e61c6f4e5932d350e1f3d08 Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Mon, 3 Jun 2013 15:25:22 +0000 Subject: [PATCH] resolved conflict OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=108 --- common-password.pamd | 2 +- pam.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common-password.pamd b/common-password.pamd index a8dc0a1..1baf490 100644 --- a/common-password.pamd +++ b/common-password.pamd @@ -9,4 +9,4 @@ # empty passwords are treated as locked accounts. # password requisite pam_cracklib.so -password required pam_unix.so use_authtok nullok try_first_pas +password required pam_unix.so use_authtok nullok try_first_pass diff --git a/pam.changes b/pam.changes index e33c86a..8099750 100644 --- a/pam.changes +++ b/pam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 27 12:26:53 CEST 2013 - kukuk@suse.de + +- Fix typo in common-password [bnc#821526] + ------------------------------------------------------------------- Fri Apr 26 10:25:06 UTC 2013 - mmeister@suse.com