diff options
| author |   martinh <martinh@openbsd.org> | 2010-06-15 15:47:56 +0000 |
|---|---|---|
| committer | martinh <martinh@openbsd.org> | 2010-06-15 15:47:56 +0000 |
| commit | a9ac9ba1624eb374491402b438cc27a83e2aa387 (patch) | |
| tree | 8bdf8fd85975810ee92d9d87bcd5fe40f30f6ace /usr.sbin/ldapd/auth.c | |
| parent | remove unused uuid_hash function, found by lint (diff) | |
| download | wireguard-openbsd-a9ac9ba1624eb374491402b438cc27a83e2aa387.tar.xz wireguard-openbsd-a9ac9ba1624eb374491402b438cc27a83e2aa387.zip | |
Make modify and simple auth requests open their own transactions, as search
already does. Trigger a reopen imsg request if either the data or index
databases are compacted. Queue the failed request and try again when the
file is reopened.
Compaction can now be done by a separate process, and ldapd will pick up
the change and reopen the file.
Diffstat (limited to 'usr.sbin/ldapd/auth.c')
| -rw-r--r-- | usr.sbin/ldapd/auth.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/ldapd/auth.c b/usr.sbin/ldapd/auth.c index 2d461ef20ec..4f26aad63e3 100644 --- a/usr.sbin/ldapd/auth.c +++ b/usr.sbin/ldapd/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.1 2010/05/31 17:36:31 martinh Exp $ */ +/* $OpenBSD: auth.c,v 1.2 2010/06/15 15:47:56 martinh Exp $ */ /* * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> @@ -20,6 +20,7 @@ #include <sys/queue.h> #include <netinet/in.h> +#include <errno.h> #include <openssl/sha.h> #include <pwd.h> #include <resolv.h> /* for b64_pton */ @@ -286,7 +287,14 @@ ldap_auth_simple(struct request *req, char *binddn, struct ber_element *auth) LDAP_SCOPE_BASE)) return LDAP_INSUFFICIENT_ACCESS; - elm = namespace_get(ns, binddn); + if (ns->data_db == NULL || + ((elm = namespace_get(ns, binddn)) == NULL && + errno == EAGAIN)) { + if (namespace_queue_request(ns, req) != 0) + return LDAP_BUSY; + return -1; /* Database is being reopened. */ + } + if (elm != NULL) pw = ldap_get_attribute(elm, "userPassword"); if (pw != NULL) { @@ -355,7 +363,8 @@ ldap_bind(struct request *req) switch (auth->be_type) { case LDAP_AUTH_SIMPLE: - rc = ldap_auth_simple(req, binddn, auth); + if ((rc = ldap_auth_simple(req, binddn, auth)) < 0) + return rc; break; case LDAP_AUTH_SASL: if ((rc = ldap_auth_sasl(req, binddn, auth)) == LDAP_SUCCESS) |