summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartinh <martinh@openbsd.org>2010-06-29 02:54:20 +0000
committermartinh <martinh@openbsd.org>2010-06-29 02:54:20 +0000
commit639fdb7daf413ad7a126e95a7355e0144532b9a5 (patch)
tree6d4f2ad16d11f24c77141c9a66d41dee7d848c8e
parentUpdate default ldapd.conf to reflect changes in the schema parser. (diff)
downloadwireguard-openbsd-639fdb7daf413ad7a126e95a7355e0144532b9a5.tar.xz
wireguard-openbsd-639fdb7daf413ad7a126e95a7355e0144532b9a5.zip
don't overwrite the return code from validate_entry
-rw-r--r--usr.sbin/ldapd/modify.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ldapd/modify.c b/usr.sbin/ldapd/modify.c
index 79921dd14c2..12507c276d3 100644
--- a/usr.sbin/ldapd/modify.c
+++ b/usr.sbin/ldapd/modify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modify.c,v 1.4 2010/06/29 02:45:46 martinh Exp $ */
+/* $OpenBSD: modify.c,v 1.5 2010/06/29 02:54:20 martinh Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -125,7 +125,7 @@ ldap_add(struct request *req)
namespace_abort(ns);
if (rc == LDAP_SUCCESS && errno == EEXIST)
rc = LDAP_ALREADY_EXISTS;
- else
+ else if (rc == LDAP_SUCCESS)
rc = LDAP_OTHER;
} else if (namespace_commit(ns) != 0)
rc = LDAP_OTHER;