Attachment #6316 for bug #35847

View | Details | Raw Unified | Return to bug 35847
Collapse All | Expand All

Lines 1-3 Link Here

(-)debian/changelog (+7 lines)
		1	univention-management-console (7.1.62-1) UNRELEASED; urgency=medium
		2
		3	* Bug #35985: Fix case where posix authentication still works (not locked)
		4	but acct_mgmt fails because something is expired.
		5
		6	-- Arvid Requate <requate@univention.de> Thu, 06 Nov 2014 13:05:14 +0100
		7
1	univention-management-console (7.1.61-1) unstable; urgency=medium	8	univention-management-console (7.1.61-1) unstable; urgency=medium
2		9
3	* Bug #32818: improved connection handling	10	* Bug #32818: improved connection handling





		try:
			pam.authenticate()
			self._validate_account(pam)
		except PAMError as pam_err:
			AUTH.error("PAM: authentication error: %s" % (pam_err,))


				self._validate_account(pam)

			raise AuthenticationFailed(self.error_message(pam_err))
		else:
			self.__workaround_pw_expired = False

		self._validate_account(pam)

	def _validate_account(self, pam):
		try:
			pam.acct_mgmt()

Return to bug 35847

Lines 122-127 Link Here

(-)src/univention/management/console/pam.py (-3 / +3 lines)
122		122
123	try:	123	try:
124	pam.authenticate()	124	pam.authenticate()
		125	self._validate_account(pam)
125	except PAMError as pam_err:	126	except PAMError as pam_err:
126	AUTH.error("PAM: authentication error: %s" % (pam_err,))	127	AUTH.error("PAM: authentication error: %s" % (pam_err,))
127		128
Lines 129-138 Link Here
129	self._validate_account(pam)	130	self._validate_account(pam)
130		131
131	raise AuthenticationFailed(self.error_message(pam_err))	132	raise AuthenticationFailed(self.error_message(pam_err))
132	self.__workaround_pw_expired = False	133	else:
		134	self.__workaround_pw_expired = False
133		135
134	self._validate_account(pam)
135
136	def _validate_account(self, pam):	136	def _validate_account(self, pam):
137	try:	137	try:
138	pam.acct_mgmt()	138	pam.acct_mgmt()