Attachment #9412 for bug #41574

View | Details | Raw Unified | Return to bug 41574 | Differences between
Collapse All | Expand All




	return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(seconds))


def posixDaysToLocalDate(days):
	return time.strftime("%Y-%m-%d", time.localtime(long(days) * 3600 * 24))


def sambaWorkstationsMap(workstations):

	# shadowExpire contains the absolute date to expire the account.

	if 'shadowExpire' in oldattr and len(oldattr['shadowExpire']) > 0:
		univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'userexpiry: %s' % posixDaysToLocalDate(oldattr['shadowExpire'][0]))
		if oldattr['shadowExpire'][0] != '1':
			return posixDaysToLocalDate(oldattr['shadowExpire'][0])


def unmapKrb5ValidEndToUserexpiry(oldattr):
	if 'krb5ValidEnd' in oldattr:
		krb5validend = oldattr['krb5ValidEnd'][0]
		univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5validend is: %s' % krb5validend)
		userexpiry_epoch = calendar.timegm(time.strptime(krb5validend, '%Y%m%d%H%M%SZ'))
		return time.strftime("%Y-%m-%d", time.localtime(userexpiry_epoch))


def unmapSambaKickoffTimeToUserexpiry(oldattr):
	if 'sambaKickoffTime' in oldattr:
		univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime is: %s' % oldattr['sambaKickoffTime'][0])
		return time.strftime("%Y-%m-%d", time.localtime(long(oldattr['sambaKickoffTime'][0]) + (3600 * 24)))


def unmapPasswordExpiry(oldattr):

			shadow_last_change = int(oldattr['shadowLastChange'][0])
		except ValueError:
			univention.debug.debug(univention.debug.ADMIN, univention.debug.WARN, 'users/user: failed to calculate password expiration correctly, use only shadowMax instead')
		return posixDaysToLocalDate(shadow_last_change + shadow_max)


def unmapDisabled(oldattr):

			return ml

		krb_keys = univention.admin.password.krb5_asn1(self.krb5_principal(), self['password'])
		krb_key_version = str(int(self.oldattr.get('krb5KeyVersionNumber', ['0'])[0]))
		ml.append(('krb5Key', self.oldattr.get('krb5Key', []), krb_keys))
		ml.append(('krb5KeyVersionNumber', self.oldattr.get('krb5KeyVersionNumber', []), krb_key_version))
		return ml

		if self.hasChanged('userexpiry'):
			krb5ValidEnd = ''
			if self['userexpiry']:
				userexpiry_epoch = time.mktime(time.strptime(self['userexpiry'], "%Y-%m-%d"))
				krb5ValidEnd = time.strftime("%Y%m%d000000Z", time.gmtime(userexpiry_epoch))
				univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5ValidEnd: %s' % krb5ValidEnd)
			old_krb5ValidEnd = self.oldattr.get('krb5ValidEnd', '')
			if old_krb5ValidEnd != krb5ValidEnd:

			if self['disabled'] == '1' and self.hasChanged('disabled') and not self.hasChanged('userexpiry'):
				shadowExpire = '1'
			elif self['userexpiry']:
				shadowExpire = "%d" % long(time.mktime(time.strptime(self['userexpiry'], "%Y-%m-%d")) / 3600 / 24)
			elif self['disabled'] == '1':
				shadowExpire = '1'
			else:




	return s4_resultlist


def userexpiry2accountExpires(l):
	d = 116444736000000000L  # difference between 1601 and 1970
	return long(time.mktime(time.strptime(l, "%Y-%m-%d")) - 86400) * 10000000 + d  # 86400s is one day


def accountExpires2userexpiry(l):
	d = 116444736000000000L  # difference between 1601 and 1970
	return time.strftime("%Y-%m-%d", time.localtime((l - d) / 10000000) + 86400)


def samba2s4_time(l):
	d = 116444736000000000L  # difference between 1601 and 1970
	return long(l) * 10000000 + d


def s42samba_time(l):

				modlist.append((ldap.MOD_REPLACE, 'accountExpires', ['9223372036854775807']))
		else:
			# ucs account expired
			accountExpires_ucs = userexpiry2accountExpires(ucs_admin_object['userexpiry'])
			if 'accountExpires' in ldap_object_s4 and ldap_object_s4['accountExpires'][0] != accountExpires_ucs:
				# s4 account not expired -> change
				modlist.append((ldap.MOD_REPLACE, 'accountExpires', [str(accountExpires_ucs)]))

		if modlist:
			ud.debug(ud.LDAP, ud.ALL, "disable_user_from_ucs: modlist: %s" % modlist)

			# s4 account expired
			ud.debug(ud.LDAP, ud.INFO, "sync account_expire:      s4time: %s    unixtime: %s" % (long(ldap_object_s4['accountExpires'][0]), ucs_admin_object['userexpiry']))

			userexpiry_s4 = accountExpires2userexpiry(long(ldap_object_s4['accountExpires'][0]))
			if userexpiry_s4 != ucs_admin_object['userexpiry']:
				# ucs account not expired -> change
				ucs_admin_object['userexpiry'] = userexpiry_s4
				modified = 1

		if modified:

Return to bug 41574