Add empty modify fix (ITS#4183)

diff --git a/CHANGES b/CHANGES
index 0339a7d375a54c4e3cc7eeaf742bcbe0f76e238a..ae3e453f59c56c32e967758ce31420691b3c16ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.3.12 Release
        Fixed libldap HSTRERROR issue (ITS#4124)
        Added libldap/slapd TLS DSA certificate support (ITS#4017)
        Fixed libldap SASL bind issue (ITS#4158)
+       Fixed ldapmodrdn empty line handling (ITS#4101)
        Fixed client tools additional info printing (ITS#4147)
        Updated slapd ldaps:// not configured fix (ITS#4082,4083)
        Fixed slapd illegal S option bug (ITS#4119)
@@ -16,7 +17,9 @@ OpenLDAP 2.3.12 Release
        Fixed slapd non-reentrant libwrap issue (ITS#4099)
        Fixed slapd AIX IFMT issue (ITS#4123)
        Fixed slapd thread v. tools_threads settings
-       Fixed ldapmodrdn empty line handling (ITS#4101)
+       Fixed slapd spurious defer message (ITS#3850)
+       Fixed slapd attribute SYNTAX OIDM issue (ITS#4116)
+       Fixed slapd modify empty sequence bug (ITS#4183)
        Fixed slapd-bdb uninitialized condition in tool mode (ITS#4143)
        Fixed slapd-bdb empty suffix and syncprov issue (ITS#4171)
        Fixed slapd-hdb syncrepl deadlock issue (ITS#4088)
@@ -32,8 +35,6 @@ OpenLDAP 2.3.12 Release
        Fixed slapo-ppolicy pwdFailureTIme after bind success issue (ITS#4134)
        Fixed slapo-ppolicy add passord_hash quality config dependency
        Fixed slapo-syncprov LDAP response types (ITS#4183)
-       Fixed slapd spurious defer message (ITS#3850)
-       Fixed slapd attribute SYNTAX OIDM issue (ITS#4116)
        Added slapd delta syncrepl support
        Added slapadd thread support
        Updated slapcat subordinate database handling (ITS#4089)

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 90c7d3c3a0901f60388365b006b26d5ae7511f27..1fae806ddf02986626d5414c7ac5a9e6822caa82 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -169,6 +169,14 @@ do_modify(
        }
        *modtail = NULL;
 
+       if ( modlist == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "do_modify: no modifications\n", 0, 0, 0 );
+               send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
+                       "change sequence empty" );
+
+               goto cleanup;
+       }
+
        if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );