|
Lines 732-737
property_descriptions = {
|
Link Here
|
|---|
|
|---|
| 732 |
multivalue=True, |
732 |
multivalue=True, |
| 733 |
copyable=True, |
733 |
copyable=True, |
| 734 |
), |
734 |
), |
|
|
735 |
'kerberosPrinciple': univention.admin.property( |
| 736 |
short_description=_('Kerberos principal'), |
| 737 |
long_description=_('FIXME'), |
| 738 |
syntax=univention.admin.syntax.string, |
| 739 |
copyable=True, |
| 740 |
), |
| 735 |
} |
741 |
} |
| 736 |
|
742 |
|
| 737 |
default_property_descriptions = copy.deepcopy(property_descriptions) # for later reset of descriptions |
743 |
default_property_descriptions = copy.deepcopy(property_descriptions) # for later reset of descriptions |
|
Lines 1187-1192
def unmapWindowsFiletime(old):
|
Link Here
|
|---|
|
|---|
| 1187 |
return '' |
1193 |
return '' |
| 1188 |
|
1194 |
|
| 1189 |
|
1195 |
|
|
|
1196 |
def unmapKerberosPrincipalName(old): |
| 1197 |
if old and old[0]: |
| 1198 |
return old[0].rsplit('@', 1)[0] |
| 1199 |
|
| 1200 |
|
| 1190 |
mapping = univention.admin.mapping.mapping() |
1201 |
mapping = univention.admin.mapping.mapping() |
| 1191 |
mapping.register('username', 'uid', None, univention.admin.mapping.ListToString) |
1202 |
mapping.register('username', 'uid', None, univention.admin.mapping.ListToString) |
| 1192 |
mapping.register('uidNumber', 'uidNumber', None, univention.admin.mapping.ListToString) |
1203 |
mapping.register('uidNumber', 'uidNumber', None, univention.admin.mapping.ListToString) |
|
Lines 1239-1244
mapping.register('userCertificate', 'userCertificate;binary', univention.admin.m
|
Link Here
|
|---|
|
|---|
| 1239 |
mapping.register('jpegPhoto', 'jpegPhoto', univention.admin.mapping.mapBase64, univention.admin.mapping.unmapBase64) |
1250 |
mapping.register('jpegPhoto', 'jpegPhoto', univention.admin.mapping.mapBase64, univention.admin.mapping.unmapBase64) |
| 1240 |
mapping.register('umcProperty', 'univentionUMCProperty', mapKeyAndValue, unmapKeyAndValue) |
1251 |
mapping.register('umcProperty', 'univentionUMCProperty', mapKeyAndValue, unmapKeyAndValue) |
| 1241 |
mapping.register('lockedTime', 'sambaBadPasswordTime', mapWindowsFiletime, unmapWindowsFiletime) |
1252 |
mapping.register('lockedTime', 'sambaBadPasswordTime', mapWindowsFiletime, unmapWindowsFiletime) |
|
|
1253 |
mapping.register('kerberosPrinciple', 'krb5PrincipalName', univention.admin.mapping.dontMap(), unmapKerberosPrincipalName) |
| 1242 |
|
1254 |
|
| 1243 |
mapping.registerUnmapping('sambaRID', unmapSambaRid) |
1255 |
mapping.registerUnmapping('sambaRID', unmapSambaRid) |
| 1244 |
mapping.registerUnmapping('passwordexpiry', unmapPasswordExpiry) |
1256 |
mapping.registerUnmapping('passwordexpiry', unmapPasswordExpiry) |
|
Lines 1596-1602
class object(univention.admin.handlers.simpleLdap):
|
Link Here
|
|---|
|
|---|
| 1596 |
realm = domain.getKerberosRealm() |
1608 |
realm = domain.getKerberosRealm() |
| 1597 |
if not realm: |
1609 |
if not realm: |
| 1598 |
raise univention.admin.uexceptions.noKerberosRealm() |
1610 |
raise univention.admin.uexceptions.noKerberosRealm() |
| 1599 |
return self['username'] + '@' + realm |
1611 |
return self.get('kerberosPrinciple', self['username']) + '@' + realm |
| 1600 |
|
1612 |
|
| 1601 |
def _check_uid_gid_uniqueness(self): |
1613 |
def _check_uid_gid_uniqueness(self): |
| 1602 |
if not configRegistry.is_true("directory/manager/uid_gid/uniqueness", True): |
1614 |
if not configRegistry.is_true("directory/manager/uid_gid/uniqueness", True): |
|
Lines 1787-1793
class object(univention.admin.handlers.simpleLdap):
|
Link Here
|
|---|
|
|---|
| 1787 |
return ml |
1799 |
return ml |
| 1788 |
|
1800 |
|
| 1789 |
def _modlist_krb_principal(self, ml): |
1801 |
def _modlist_krb_principal(self, ml): |
| 1790 |
if not self.exists() or self.hasChanged('username'): |
1802 |
if not self.exists() or self.hasChanged(['username', 'kerberosPrinciple']): |
| 1791 |
ml.append(('krb5PrincipalName', self.oldattr.get('krb5PrincipalName', []), [self.krb5_principal()])) |
1803 |
ml.append(('krb5PrincipalName', self.oldattr.get('krb5PrincipalName', []), [self.krb5_principal()])) |
| 1792 |
return ml |
1804 |
return ml |
| 1793 |
|
1805 |
|