X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapmodify.c;h=fd578a68f2837c149ec6a2ea2585880a39993a62;hb=59e9ff6243465640956b58ad1756a3ede53eca7c;hp=7a021b77322b4cab8c65d38e3509d6130037bf9b;hpb=1d4e37652c04cde2bb283be466edb4bff3d8b404;p=openldap

diff --git a/servers/slapd/slapmodify.c b/servers/slapd/slapmodify.c
index 7a021b7732..fd578a68f2 100644
--- 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-2015 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;
 		}