Attachment 10387 Details for Bug 51478

[patch] patch

51478.patch (text/plain), 1.46 KB, created by Florian Best on 2020-06-12 17:03 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2020-06-12 17:03 CEST

Size: 1.46 KB

patch

obsolete

>diff --git management/univention-directory-manager-modules/univention-migrate-users-to-ucs4.3 management/univention-directory-manager-modules/univention-migrate-users-to-ucs4.3
>index b7a1411d8b..4c33bc033d 100755
>--- management/univention-directory-manager-modules/univention-migrate-users-to-ucs4.3
>+++ management/univention-directory-manager-modules/univention-migrate-users-to-ucs4.3
>@@ -125,6 +125,8 @@ class Migration(object):
> 			has_shadow = ocs & {'shadowAccount', }
> 			has_samba = ocs & {'sambaSamAccount', }
> 			has_kerberos = ocs & {'krb5Principal', 'krb5KDCEntry', }
>+			has_kerberos_principal = ocs & {'krb5Principal', }
>+			has_kerberos_kdcentry = ocs & {'krb5KDCEntry', }
> 			has_mail = ocs & {'univentionMail', }
> 			has_org_person = ocs & {'organizationalPerson', }
> 			has_inet_org_person = ocs & {'inetOrgPerson', }
>@@ -257,10 +259,11 @@ class Migration(object):
> 			if ocs_to_add & {u'inetOrgPerson', u'organizationalPerson'}:
> 				serverctrls = [ldap.controls.simple.RelaxRulesControl()]
> 
>-			if not has_kerberos:
>+			if not has_kerberos_principal and not has_kerberos_kdcentry:
>+				ml.append(('krb5PrincipalName', [], [b'%s@%s' % (user['uid'][0], realm.encode('UTF-8'))]))
>+			if not has_kerberos_kdcentry:
> 				flags = b'254' if disabled else b'126'
> 				ml.extend([
>-					('krb5PrincipalName', [], [b'%s@%s' % (user['uid'][0], realm.encode('UTF-8'))]),
> 					('krb5KeyVersionNumber', [], [b'1']),
> 					('krb5KDCFlags', [], [flags]),
> 					('krb5MaxLife', [], [b'86400']),

Actions: View | Diff

Attachments on bug 51478: 10387