SF Bug #3448530 - Treat krbExtraData and krbPrincipalKey as binary

This commit is contained in:
Roland Gruber 2012-09-04 15:09:24 +10:00 committed by Deon George
parent 74434e5ca3
commit c4b6695beb
2 changed files with 3 additions and 1 deletions

View File

@ -2277,6 +2277,8 @@ class ldap extends DS {
strcasecmp($attr_name,'objectSID') == 0 ||
strcasecmp($attr_name,'auditingPolicy') == 0 ||
strcasecmp($attr_name,'jpegPhoto') == 0 ||
strcasecmp($attr_name,'krbExtraData') == 0 ||
strcasecmp($attr_name,'krbPrincipalKey') == 0 ||
$syntax == '1.3.6.1.4.1.1466.115.121.1.10' ||
$syntax == '1.3.6.1.4.1.1466.115.121.1.28' ||
$syntax == '1.3.6.1.4.1.1466.115.121.1.5' ||

View File

@ -589,7 +589,7 @@ class ImportLDIF extends Import {
$attrs['newsuperior'] = $attrvalue[1];
} else
return $this->error(_('A valid newsuperier attribute should be specified'),$lines);
return $this->error(_('A valid newsuperior attribute should be specified'),$lines);
} else
$attrs['newsuperior'] = $server->getContainer($this->template->getDN());