import fix to ITS#5071

diff --git a/CHANGES b/CHANGES
index 4a282428ad0b461d33f3bad4c330fdbfab6f0c2c..f159b4aa9cdc99fc2ec2be823ea1428a2000015f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.38 Engineering
+       Fixed slapadd check for ';binary' when required (ITS#5071)
        Fixed slapd AVA_Sort on multivalued RDNs (ITS#5057)
        Fixed slapd integer/pointer types and overflow (ITS#5035)
        Fixed slapd select_backend/ManageDSAit (ITS#4986)

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index af8b3c7ec440deaa043f94b1a1573afceb9eb823..b1739d823411c410adf80bcd04bbc373807989dc 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -231,6 +231,16 @@ str2entry2( char *s, int checkvals )
                                        goto fail;
                                }
                        }
+
+                       /* require ';binary' when appropriate (ITS#5071) */
+                       if ( slap_syntax_is_binary( ad->ad_type->sat_syntax ) && !slap_ad_is_binary( ad ) ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "str2entry: attributeType %s #%d: "
+                                       "needs ';binary' transfer as per syntax %s\n", 
+                                       ad->ad_cname.bv_val, 0,
+                                       ad->ad_type->sat_syntax->ssyn_oid );
+                               goto fail;
+                       }
                }
 
                if (( ad_prev && ad != ad_prev ) || ( i == lines )) {