From f67bc2686363242b74ad8cc13991a110efac1786 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 3 Aug 2007 19:25:41 +0000
Subject: [PATCH] import fix to ITS#5071

---
 CHANGES               |  1 +
 servers/slapd/entry.c | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4a282428ad..f159b4aa9c 100644
--- 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 af8b3c7ec4..b1739d8234 100644
--- 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 )) {
-- 
2.39.5