summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartinh <martinh@openbsd.org>2010-07-01 17:21:25 +0000
committermartinh <martinh@openbsd.org>2010-07-01 17:21:25 +0000
commitfc0162c4e01f0d201384ad5c61fd9756c5e5ef2a (patch)
tree449a4ce3fe3aa898eb6c64fb3de09b2317cf2b58
parentSO_PEERCRED should pass out the main pid, not the "pid" of the current (diff)
downloadwireguard-openbsd-fc0162c4e01f0d201384ad5c61fd9756c5e5ef2a.tar.xz
wireguard-openbsd-fc0162c4e01f0d201384ad5c61fd9756c5e5ef2a.zip
Give a more descriptive error message when an object class definition
references non-existent attribute types. from william@
-rw-r--r--usr.sbin/ldapd/schema.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/ldapd/schema.c b/usr.sbin/ldapd/schema.c
index a8403bfd25a..88c0128e090 100644
--- a/usr.sbin/ldapd/schema.c
+++ b/usr.sbin/ldapd/schema.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schema.c,v 1.4 2010/07/01 03:47:59 martinh Exp $ */
+/* $OpenBSD: schema.c,v 1.5 2010/07/01 17:21:25 martinh Exp $ */
/*
* Copyright (c) 2010 Martin Hedenfalk <martinh@openbsd.org>
@@ -586,8 +586,10 @@ schema_parse_attrlist(struct schema *schema)
}
if (token != STRING)
goto fail;
- if ((attr = lookup_attribute(schema, kw)) == NULL)
+ if ((attr = lookup_attribute(schema, kw)) == NULL) {
+ schema_err(schema, "%s: no such attribute", kw);
goto fail;
+ }
alist = push_attr(alist, attr);
want_dollar = 1;
}