From d92e16a8599879c5e7529695475be1ab25490e06 Mon Sep 17 00:00:00 2001
From: tmraz <devnull@localhost>
Date: Oct 06 2006 20:11:42 +0000
Subject: * Fri Oct  6 2006 Tomas Mraz <tmraz@redhat.com> - 5.3.10-1

- fixed passwd PAM stack when PKCS11 enabled (#195960)
- make authconfig --probe work again (#209676)

---

diff --git a/authconfig.py b/authconfig.py
index 751a429..c33d237 100755
--- a/authconfig.py
+++ b/authconfig.py
@@ -237,17 +237,17 @@ class Authconfig:
 			parser.parse_args(["-h"])
 	
 	def probe(self):
-		authinfo = authinfo.AuthInfo(self.printError)
-		authinfo.probe()
-		if authinfo.hesiodLHS and authinfo.hesiodRHS:
-			print "hesiod %s/%s" % (authinfo.hesiodLHS,
- 				authinfo.hesiodRHS)
-		if authinfo.ldapServer and authinfo.ldapBaseDN:
-			print "ldap %s/%s\n" % (authinfo.ldapServer,
-				authinfo.ldapBaseDN)
-		if authinfo.kerberosRealm:
-			print "krb5 %s/%s/%s\n" % (authinfo.kerberosRealm,
-				authinfo.kerberosKDC or "", authinfo.kerberosAdminServer or "")
+		info = authinfo.AuthInfo(self.printError)
+		info.probe()
+		if info.hesiodLHS and info.hesiodRHS:
+			print "hesiod %s/%s" % (info.hesiodLHS,
+ 				info.hesiodRHS)
+		if info.ldapServer and info.ldapBaseDN:
+			print "ldap %s/%s\n" % (info.ldapServer,
+				info.ldapBaseDN)
+		if info.kerberosRealm:
+			print "krb5 %s/%s/%s\n" % (info.kerberosRealm,
+				info.kerberosKDC or "", info.kerberosAdminServer or "")
 	
 	def readAuthInfo(self):
 		self.info = authinfo.read(self.printError)
diff --git a/authconfig.spec.in b/authconfig.spec.in
index abf6b7f..298f7dd 100644
--- a/authconfig.spec.in
+++ b/authconfig.spec.in
@@ -95,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Oct  6 2006 Tomas Mraz <tmraz@redhat.com> - 5.3.10-1
+- fixed passwd PAM stack when PKCS11 enabled (#195960)
+- make authconfig --probe work again (#209676)
+
 * Mon Oct  2 2006 Tomas Mraz <tmraz@redhat.com> - 5.3.9-1
 - updated translations (#207095)
 - correctly write pam_smb.conf with only one server specified (#208365)
diff --git a/authinfo.py b/authinfo.py
index 26cef56..0e03c33 100644
--- a/authinfo.py
+++ b/authinfo.py
@@ -2579,7 +2579,7 @@ class AuthInfo:
 		output = ""
 		if stack and logic:
 			args = ""
-			if module[NAME] == "pkcs11":
+			if module[NAME] == "pkcs11" and stack == "auth":
 				if self.forceSmartcard:
 					if self.enableKerberos:
 						logic = LOGIC_FORCE_PKCS11_KRB5
diff --git a/configure.in b/configure.in
index 4dd63d4..9797cbc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(authconfig,5.3.9)
+AC_INIT(authconfig,5.3.10)
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 AC_PREFIX_DEFAULT(/usr)
 AC_PROG_CC