diff options
Diffstat (limited to 'usr.sbin/ypldap/ldapclient.c')
| -rw-r--r-- | usr.sbin/ypldap/ldapclient.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c index 942d2487ead..6814e375b73 100644 --- a/usr.sbin/ypldap/ldapclient.c +++ b/usr.sbin/ypldap/ldapclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldapclient.c,v 1.22 2011/08/28 11:53:16 aschrijver Exp $ */ +/* $OpenBSD: ldapclient.c,v 1.23 2011/08/28 16:37:28 aschrijver Exp $ */ /* * Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org> @@ -461,12 +461,12 @@ client_build_req(struct idm *idm, struct idm_req *ir, struct aldap_message *m, GID_MAX, NULL); } } else if (idm->idm_list & F_LIST(i)) { - if (aldap_match_entry(m, idm->idm_attrs[i], &ldap_attrs) == -1) + if (aldap_match_attr(m, idm->idm_attrs[i], &ldap_attrs) == -1) return (-1); if (ldap_attrs[0] == NULL) return (-1); for (k = 0; k >= 0 && ldap_attrs[k] != NULL; k++) { - /* XXX: Fail when entries have ilegal characters e.g. ',' */ + /* XXX: Fail when attributes have ilegal characters e.g. ',' */ if (strlcat(ir->ir_line, ldap_attrs[k], sizeof(ir->ir_line)) >= sizeof(ir->ir_line)) continue; @@ -474,19 +474,19 @@ client_build_req(struct idm *idm, struct idm_req *ir, struct aldap_message *m, if (strlcat(ir->ir_line, ",", sizeof(ir->ir_line)) >= sizeof(ir->ir_line)) { - aldap_free_entry(ldap_attrs); + aldap_free_attr(ldap_attrs); return (-1); } } - aldap_free_entry(ldap_attrs); + aldap_free_attr(ldap_attrs); } else { - if (aldap_match_entry(m, idm->idm_attrs[i], &ldap_attrs) == -1) + if (aldap_match_attr(m, idm->idm_attrs[i], &ldap_attrs) == -1) return (-1); if (ldap_attrs[0] == NULL) return (-1); if (strlcat(ir->ir_line, ldap_attrs[0], sizeof(ir->ir_line)) >= sizeof(ir->ir_line)) { - aldap_free_entry(ldap_attrs); + aldap_free_attr(ldap_attrs); return (-1); } if (i == ATTR_UID) { @@ -496,7 +496,7 @@ client_build_req(struct idm *idm, struct idm_req *ir, struct aldap_message *m, ir->ir_key.ik_uid = strtonum( ldap_attrs[0], 0, GID_MAX, NULL); } - aldap_free_entry(ldap_attrs); + aldap_free_attr(ldap_attrs); } if (i + 1 != max_attr) |