diff options
Diffstat (limited to 'usr.sbin/ldapd/validate.c')
| -rw-r--r-- | usr.sbin/ldapd/validate.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.sbin/ldapd/validate.c b/usr.sbin/ldapd/validate.c index a1cc215e470..8df2c710180 100644 --- a/usr.sbin/ldapd/validate.c +++ b/usr.sbin/ldapd/validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: validate.c,v 1.7 2010/07/01 06:15:55 martinh Exp $ */ +/* $OpenBSD: validate.c,v 1.8 2010/09/03 09:39:17 martinh Exp $ */ /* * Copyright (c) 2010 Martin Hedenfalk <martin@bzero.se> @@ -51,6 +51,7 @@ validate_attribute(struct attr_type *at, struct ber_element *vals) { int nvals = 0; struct ber_element *elm; + char *val; if (vals == NULL) { log_debug("missing values"); @@ -63,7 +64,7 @@ validate_attribute(struct attr_type *at, struct ber_element *vals) } for (elm = vals->be_sub; elm != NULL; elm = elm->be_next) { - if (elm->be_type != BER_TYPE_OCTETSTRING) { + if (ber_get_string(elm, &val) == -1) { log_debug("attribute value not an octet-string"); return LDAP_PROTOCOL_ERROR; } @@ -73,6 +74,14 @@ validate_attribute(struct attr_type *at, struct ber_element *vals) " attribute %s", ATTR_NAME(at)); return LDAP_CONSTRAINT_VIOLATION; } + + if (at->syntax->is_valid != NULL && + !at->syntax->is_valid(conf->schema, val, elm->be_len)) { + log_debug("%s: invalid syntax", ATTR_NAME(at)); + log_debug("syntax = %s", at->syntax->desc); + log_debug("value: [%.*s]", elm->be_len, val); + return LDAP_INVALID_SYNTAX; + } } /* There must be at least one value in an attribute. */ |