From ba0e6657f57d1712b07ec61ebd3860742362fb01 Mon Sep 17 00:00:00 2001 From: Martin Hedenfal Date: Wed, 30 Jun 2010 17:16:10 +0000 Subject: Don't send statistics for referral namespaces. This unbreaks ldapctl stats. Avoid null pointer dereference when reopening a namespace. --- usr.sbin/ldapd/ldape.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'usr.sbin/ldapd/ldape.c') diff --git a/usr.sbin/ldapd/ldape.c b/usr.sbin/ldapd/ldape.c index 4f8c4744dd8..a663cf88f29 100644 --- a/usr.sbin/ldapd/ldape.c +++ b/usr.sbin/ldapd/ldape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldape.c,v 1.8 2010/06/29 21:54:38 martinh Exp $ */ +/* $OpenBSD: ldape.c,v 1.9 2010/06/30 17:16:09 martinh Exp $ */ /* * Copyright (c) 2009, 2010 Martin Hedenfalk @@ -463,6 +463,8 @@ ldape_open_result(struct imsg *imsg) log_debug("open(%s) returned fd %i", oreq->path, imsg->fd); TAILQ_FOREACH(ns, &conf->namespaces, next) { + if (namespace_has_referrals(ns)) + continue; if (strcmp(oreq->path, ns->data_path) == 0) { namespace_set_data_fd(ns, imsg->fd); break; -- cgit v1.2.3