Happy New Year

[openldap] / servers / slapd / slapmodify.c

diff --git a/servers/slapd/slapmodify.c b/servers/slapd/slapmodify.c
index 0954bb21b100db6809722fc751c32cdd7414ba60..fd578a68f2837c149ec6a2ea2585880a39993a62 100644 (file)
--- a/servers/slapd/slapmodify.c
+++ b/servers/slapd/slapmodify.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2016 The OpenLDAP Foundation.
+ * Copyright 1998-2018 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -190,7 +190,7 @@ slapmodify( int argc, char **argv )
                                request = "delete";
                                break;
                        }
-                       /* backend does not support delete, fallthrough */
+                       /* backend does not support delete, fallthru */
 
                case LDAP_REQ_MODRDN:
                        fprintf( stderr, "%s: request 0x%lx not supported (line=%lu)\n",
@@ -285,7 +285,9 @@ slapmodify( int argc, char **argv )
                                rc = (id == NOID);
                                if ( rc == LDAP_SUCCESS && lr.lr_op != LDAP_REQ_DELETE ) {
                                        e_orig = be->be_entry_get( be, id );
-                                       e = entry_dup( e_orig );
+                                       if ( e_orig )
+                                               e = entry_dup( e_orig );
+                                       rc = (e == NULL);
                                }
                                break;
                }