|
Lines 1276-1282
def unmapKrb5ValidEndToUserexpiry(oldattr):
Link Here
|
| 1276 |
if 'krb5ValidEnd' in oldattr: |
1276 |
if 'krb5ValidEnd' in oldattr: |
| 1277 |
krb5validend = oldattr['krb5ValidEnd'][0] |
1277 |
krb5validend = oldattr['krb5ValidEnd'][0] |
| 1278 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5validend is: %s' % krb5validend) |
1278 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5validend is: %s' % krb5validend) |
| 1279 |
return "%s-%s-%s" % (krb5validend[0:4], krb5validend[4:6], krb5validend[6:8]) |
1279 |
userexpiry_epoch = calendar.timegm(time.strptime(krb5validend, '%Y%m%d%H%M%SZ')) |
|
|
1280 |
return time.strftime("%Y-%m-%d", time.gmtime(userexpiry_epoch)) |
| 1280 |
|
1281 |
|
| 1281 |
|
1282 |
|
| 1282 |
def unmapSambaKickoffTimeToUserexpiry(oldattr): |
1283 |
def unmapSambaKickoffTimeToUserexpiry(oldattr): |
|
Lines 2182-2188
class object(univention.admin.handlers.simpleLdap):
Link Here
|
| 2182 |
if self.hasChanged('userexpiry'): |
2183 |
if self.hasChanged('userexpiry'): |
| 2183 |
sambaKickoffTime = '' |
2184 |
sambaKickoffTime = '' |
| 2184 |
if self['userexpiry']: |
2185 |
if self['userexpiry']: |
| 2185 |
sambaKickoffTime = "%d" % long(time.mktime(time.strptime(self['userexpiry'], "%Y-%m-%d"))) |
2186 |
sambaKickoffTime = "%d" % long(calendar.timegm(time.strptime(self['userexpiry'], "%Y-%m-%d"))) |
| 2186 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime: %s' % sambaKickoffTime) |
2187 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'sambaKickoffTime: %s' % sambaKickoffTime) |
| 2187 |
old_sambaKickoffTime = self.oldattr.get('sambaKickoffTime', '') |
2188 |
old_sambaKickoffTime = self.oldattr.get('sambaKickoffTime', '') |
| 2188 |
if old_sambaKickoffTime != sambaKickoffTime: |
2189 |
if old_sambaKickoffTime != sambaKickoffTime: |
|
Lines 2193-2199
class object(univention.admin.handlers.simpleLdap):
Link Here
|
| 2193 |
if self.hasChanged('userexpiry'): |
2194 |
if self.hasChanged('userexpiry'): |
| 2194 |
krb5ValidEnd = '' |
2195 |
krb5ValidEnd = '' |
| 2195 |
if self['userexpiry']: |
2196 |
if self['userexpiry']: |
| 2196 |
krb5ValidEnd = "%s%s%s000000Z" % (self['userexpiry'][0:4], self['userexpiry'][5:7], self['userexpiry'][8:10]) |
2197 |
userexpiry_epoch = calendar.timegm(time.strptime(self['userexpiry'], "%Y-%m-%d")) |
|
|
2198 |
krb5ValidEnd = time.strftime("%Y%m%d000000Z", time.gmtime(userexpiry_epoch)) |
| 2197 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5ValidEnd: %s' % krb5ValidEnd) |
2199 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5ValidEnd: %s' % krb5ValidEnd) |
| 2198 |
old_krb5ValidEnd = self.oldattr.get('krb5ValidEnd', '') |
2200 |
old_krb5ValidEnd = self.oldattr.get('krb5ValidEnd', '') |
| 2199 |
if old_krb5ValidEnd != krb5ValidEnd: |
2201 |
if old_krb5ValidEnd != krb5ValidEnd: |
|
Lines 2208-2214
class object(univention.admin.handlers.simpleLdap):
Link Here
|
| 2208 |
if self['disabled'] == '1' and self.hasChanged('disabled') and not self.hasChanged('userexpiry'): |
2210 |
if self['disabled'] == '1' and self.hasChanged('disabled') and not self.hasChanged('userexpiry'): |
| 2209 |
shadowExpire = '1' |
2211 |
shadowExpire = '1' |
| 2210 |
elif self['userexpiry']: |
2212 |
elif self['userexpiry']: |
| 2211 |
shadowExpire = "%d" % long(time.mktime(time.strptime(self['userexpiry'], "%Y-%m-%d")) / 3600 / 24 + 1) |
2213 |
shadowExpire = "%d" % long(calendar.timegm(time.strptime(self['userexpiry'], "%Y-%m-%d")) / 3600 / 24 + 1) |
| 2212 |
elif self['disabled'] == '1': |
2214 |
elif self['disabled'] == '1': |
| 2213 |
shadowExpire = '1' |
2215 |
shadowExpire = '1' |
| 2214 |
else: |
2216 |
else: |