diff options
| -rw-r--r-- | usr.sbin/ldapd/schema.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ldapd/validate.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/ldapd/schema.c b/usr.sbin/ldapd/schema.c index 7853436e800..52af4ac499b 100644 --- a/usr.sbin/ldapd/schema.c +++ b/usr.sbin/ldapd/schema.c @@ -1,4 +1,4 @@ -/* $OpenBSD: schema.c,v 1.2 2010/06/30 04:14:59 martinh Exp $ */ +/* $OpenBSD: schema.c,v 1.3 2010/06/30 19:42:40 martinh Exp $ */ /* * Copyright (c) 2010 Martin Hedenfalk <martinh@openbsd.org> @@ -848,7 +848,7 @@ schema_parse_objectclass(struct schema *schema) if (obj->kind == KIND_STRUCTURAL && optr->object->kind == KIND_AUXILIARY) { log_warnx("structural object class '%s' cannot" - " subclass auxiliary object class '%s'", + " subclass auxiliary object class '%s'", OBJ_NAME(obj), OBJ_NAME(optr->object)); goto fail; } @@ -856,7 +856,7 @@ schema_parse_objectclass(struct schema *schema) if (obj->kind == KIND_AUXILIARY && optr->object->kind == KIND_STRUCTURAL) { log_warnx("auxiliary object class '%s' cannot" - " subclass structural object class '%s'", + " subclass structural object class '%s'", OBJ_NAME(obj), OBJ_NAME(optr->object)); goto fail; } @@ -864,7 +864,7 @@ schema_parse_objectclass(struct schema *schema) if (obj->kind == KIND_ABSTRACT && optr->object->kind != KIND_ABSTRACT) { log_warnx("abstract object class '%s' cannot" - " subclass non-abstract object class '%s'", + " subclass non-abstract object class '%s'", OBJ_NAME(obj), OBJ_NAME(optr->object)); goto fail; } diff --git a/usr.sbin/ldapd/validate.c b/usr.sbin/ldapd/validate.c index 2e3db5b08ec..66080d68176 100644 --- a/usr.sbin/ldapd/validate.c +++ b/usr.sbin/ldapd/validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: validate.c,v 1.5 2010/06/30 19:35:20 martinh Exp $ */ +/* $OpenBSD: validate.c,v 1.6 2010/06/30 19:42:40 martinh Exp $ */ /* * Copyright (c) 2010 Martin Hedenfalk <martin@bzero.se> @@ -197,7 +197,7 @@ has_attribute(struct attr_type *at, struct attr_list *alist) return 0; SLIST_FOREACH(ap, alist, next) { - if (at == ap->attr_type) + if (at == ap->attr_type) return 1; } return 0; |
