|
Lines 125-130
class Migration(object):
|
Link Here
|
|---|
|
|---|
| 125 |
has_shadow = ocs & {'shadowAccount', } |
125 |
has_shadow = ocs & {'shadowAccount', } |
| 126 |
has_samba = ocs & {'sambaSamAccount', } |
126 |
has_samba = ocs & {'sambaSamAccount', } |
| 127 |
has_kerberos = ocs & {'krb5Principal', 'krb5KDCEntry', } |
127 |
has_kerberos = ocs & {'krb5Principal', 'krb5KDCEntry', } |
|
|
128 |
has_kerberos_principal = ocs & {'krb5Principal', } |
| 129 |
has_kerberos_kdcentry = ocs & {'krb5KDCEntry', } |
| 128 |
has_mail = ocs & {'univentionMail', } |
130 |
has_mail = ocs & {'univentionMail', } |
| 129 |
has_org_person = ocs & {'organizationalPerson', } |
131 |
has_org_person = ocs & {'organizationalPerson', } |
| 130 |
has_inet_org_person = ocs & {'inetOrgPerson', } |
132 |
has_inet_org_person = ocs & {'inetOrgPerson', } |
|
Lines 257-266
class Migration(object):
|
Link Here
|
|---|
|
|---|
| 257 |
if ocs_to_add & {u'inetOrgPerson', u'organizationalPerson'}: |
259 |
if ocs_to_add & {u'inetOrgPerson', u'organizationalPerson'}: |
| 258 |
serverctrls = [ldap.controls.simple.RelaxRulesControl()] |
260 |
serverctrls = [ldap.controls.simple.RelaxRulesControl()] |
| 259 |
|
261 |
|
| 260 |
if not has_kerberos: |
262 |
if not has_kerberos_principal and not has_kerberos_kdcentry: |
|
|
263 |
ml.append(('krb5PrincipalName', [], [b'%s@%s' % (user['uid'][0], realm.encode('UTF-8'))])) |
| 264 |
if not has_kerberos_kdcentry: |
| 261 |
flags = b'254' if disabled else b'126' |
265 |
flags = b'254' if disabled else b'126' |
| 262 |
ml.extend([ |
266 |
ml.extend([ |
| 263 |
('krb5PrincipalName', [], [b'%s@%s' % (user['uid'][0], realm.encode('UTF-8'))]), |
|
|
| 264 |
('krb5KeyVersionNumber', [], [b'1']), |
267 |
('krb5KeyVersionNumber', [], [b'1']), |
| 265 |
('krb5KDCFlags', [], [flags]), |
268 |
('krb5KDCFlags', [], [flags]), |
| 266 |
('krb5MaxLife', [], [b'86400']), |
269 |
('krb5MaxLife', [], [b'86400']), |