Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / back-mdb / modify.c

diff --git a/servers/slapd/back-mdb/modify.c b/servers/slapd/back-mdb/modify.c
index 9a261882b92e5ac7e1c07ab5d741c92f6ad878d9..35682cefe8845fc70feb065fac23c440b95be3c5 100644 (file)
--- a/servers/slapd/back-mdb/modify.c
+++ b/servers/slapd/back-mdb/modify.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2014 The OpenLDAP Foundation.
+ * Copyright 2000-2015 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -601,7 +601,12 @@ mdb_modify( Operation *op, SlapReply *rs )
                Debug( LDAP_DEBUG_TRACE,
                        LDAP_XSTRING(mdb_modify) ": id2entry update failed " "(%d)\n",
                        rs->sr_err, 0, 0 );
-               rs->sr_text = "entry update failed";
+               if ( rs->sr_err == LDAP_ADMINLIMIT_EXCEEDED ) {
+                       rs->sr_text = "entry too big";
+               } else {
+                       rs->sr_err = LDAP_OTHER;
+                       rs->sr_text = "entry update failed";
+               }
                goto return_results;
        }