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

(-)/usr/share/pyshared/univention/admin/handlers/users/user.py.orig (-3 / +5 lines)
 Lines 2177-2183    Link Here 
2177
#			elif self['locked'] == '1':  # lock kerberos password
2177
#			elif self['locked'] == '1':  # lock kerberos password
2178
#				krb_kdcflags |= (1 << 17)
2178
#				krb_kdcflags |= (1 << 17)
2179
2179
2180
			ml.append(('krb5KDCFlags', str(old_kdcflags), str(krb_kdcflags)))
2180
			if str(old_kdcflags) != str(krb_kdcflags):
2181
				ml.append(('krb5KDCFlags', str(old_kdcflags), str(krb_kdcflags)))
2181
		return ml
2182
		return ml
2182
2183
2183
	## If you change anything here, please also check users/ldap.py
2184
	## If you change anything here, please also check users/ldap.py
 Lines 2197-2203    Link Here 
2197
			password_crypt = univention.admin.password.lock_password(password)
2198
			password_crypt = univention.admin.password.lock_password(password)
2198
			if self['disabled'] != '1':
2199
			if self['disabled'] != '1':
2199
				password_crypt = univention.admin.password.unlock_password(password_crypt)
2200
				password_crypt = univention.admin.password.unlock_password(password_crypt)
2200
			ml.append(('userPassword', old_password, password_crypt))
2201
			if old_password != password_crypt:
2202
				ml.append(('userPassword', old_password, password_crypt))
2201
		return ml
2203
		return ml
2202
2204
2203
	def _modlist_pwd_account_locked_time(self, ml):
2205
	def _modlist_pwd_account_locked_time(self, ml):
 Lines 2251-2257    Link Here 
2251
			else:
2253
			else:
2252
				shadowExpire = ''
2254
				shadowExpire = ''
2253
2255
2254
			old_shadowExpire = self.oldattr.get('shadowExpire', '')
2256
			old_shadowExpire = self.oldattr.get('shadowExpire', [''])[0]
2255
			if old_shadowExpire != shadowExpire:
2257
			if old_shadowExpire != shadowExpire:
2256
				ml.append(('shadowExpire', old_shadowExpire, shadowExpire))
2258
				ml.append(('shadowExpire', old_shadowExpire, shadowExpire))
2257
		return ml
2259
		return ml

Return to bug 47370