From c4b6695beb4c1182ca54bd2245f00357584975b5 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 4 Sep 2012 15:09:24 +1000 Subject: [PATCH] SF Bug #3448530 - Treat krbExtraData and krbPrincipalKey as binary --- lib/ds_ldap.php | 2 ++ lib/import_functions.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php index c591573..c346660 100644 --- a/lib/ds_ldap.php +++ b/lib/ds_ldap.php @@ -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' || diff --git a/lib/import_functions.php b/lib/import_functions.php index 3442b01..23a52f4 100644 --- a/lib/import_functions.php +++ b/lib/import_functions.php @@ -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());