|
Lines 2223-2228
def _ldap_modlist(self):
|
Link Here
|
|---|
|
|---|
| 2223 |
|
2223 |
|
| 2224 |
old_shadowMax=self.oldattr.get('shadowMax', '') |
2224 |
old_shadowMax=self.oldattr.get('shadowMax', '') |
| 2225 |
if old_shadowMax != shadowMax: |
2225 |
if old_shadowMax != shadowMax: |
|
|
2226 |
ml = [x for x in ml if x[0] != 'shadowMax'] |
| 2226 |
ml.append(('shadowMax',self.oldattr.get('shadowMax', [''])[0], shadowMax)) |
2227 |
ml.append(('shadowMax',self.oldattr.get('shadowMax', [''])[0], shadowMax)) |
| 2227 |
|
2228 |
|
| 2228 |
if 'samba' in self.options: |
2229 |
if 'samba' in self.options: |
|
Lines 2236-2241
def _ldap_modlist(self):
|
Link Here
|
|---|
|
|---|
| 2236 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5PasswordEnd: %s' % krb5PasswordEnd) |
2237 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5PasswordEnd: %s' % krb5PasswordEnd) |
| 2237 |
old_krb5PasswordEnd=self.oldattr.get('krb5PasswordEnd', '') |
2238 |
old_krb5PasswordEnd=self.oldattr.get('krb5PasswordEnd', '') |
| 2238 |
if old_krb5PasswordEnd != krb5PasswordEnd: |
2239 |
if old_krb5PasswordEnd != krb5PasswordEnd: |
|
|
2240 |
ml = [x for x in ml if x[0] != 'krb5PasswordEnd'] |
| 2239 |
ml.append(('krb5PasswordEnd',self.oldattr.get('krb5PasswordEnd', [''])[0], krb5PasswordEnd)) |
2241 |
ml.append(('krb5PasswordEnd',self.oldattr.get('krb5PasswordEnd', [''])[0], krb5PasswordEnd)) |
| 2240 |
elif pwd_change_next_login == 2: # pwdChangeNextLogin changed from 1 to 0 |
2242 |
elif pwd_change_next_login == 2: # pwdChangeNextLogin changed from 1 to 0 |
| 2241 |
# 1. determine expiryInterval (could be done once before "if self.modifypassword" above) |
2243 |
# 1. determine expiryInterval (could be done once before "if self.modifypassword" above) |
|
Lines 2263-2268
def _ldap_modlist(self):
|
Link Here
|
|---|
|
|---|
| 2263 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'shadowMax: %s' % shadowMax) |
2265 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'shadowMax: %s' % shadowMax) |
| 2264 |
old_shadowMax=self.oldattr.get('shadowMax', [''])[0] |
2266 |
old_shadowMax=self.oldattr.get('shadowMax', [''])[0] |
| 2265 |
if old_shadowMax != shadowMax: |
2267 |
if old_shadowMax != shadowMax: |
|
|
2268 |
ml = [x for x in ml if x[0] != 'shadowMax'] |
| 2266 |
ml.append(('shadowMax', old_shadowMax, shadowMax)) |
2269 |
ml.append(('shadowMax', old_shadowMax, shadowMax)) |
| 2267 |
|
2270 |
|
| 2268 |
# 3. set samba attributes |
2271 |
# 3. set samba attributes |
|
Lines 2281-2286
def _ldap_modlist(self):
|
Link Here
|
|---|
|
|---|
| 2281 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5PasswordEnd: %s' % krb5PasswordEnd) |
2284 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'krb5PasswordEnd: %s' % krb5PasswordEnd) |
| 2282 |
old_krb5PasswordEnd=self.oldattr.get('krb5PasswordEnd', [''])[0] |
2285 |
old_krb5PasswordEnd=self.oldattr.get('krb5PasswordEnd', [''])[0] |
| 2283 |
if old_krb5PasswordEnd != krb5PasswordEnd: |
2286 |
if old_krb5PasswordEnd != krb5PasswordEnd: |
|
|
2287 |
ml = [x for x in ml if x[0] != 'krb5PasswordEnd'] |
| 2284 |
ml.append(('krb5PasswordEnd',old_krb5PasswordEnd, krb5PasswordEnd)) |
2288 |
ml.append(('krb5PasswordEnd',old_krb5PasswordEnd, krb5PasswordEnd)) |
| 2285 |
|
2289 |
|
| 2286 |
|
2290 |
|