diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2009-01-27 23:29:43 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2009-01-27 23:29:43 +0000 |
| commit | d44500fae66ec8a666491c61ddc7d1214225cfc6 (patch) | |
| tree | 29ea1a5a95afb21ee64fd930ecb2a995ae14c07a /usr.sbin/ypldap | |
| parent | 81a7fbfdbb850c1855c33c660b705f2bf29927d0 (diff) | |
keep namespace clean.
discussed w/ aschrijver@
Diffstat (limited to 'usr.sbin/ypldap')
| -rw-r--r-- | usr.sbin/ypldap/ldapclient.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c index b8f9b23c7f3..339f8f46ecc 100644 --- a/usr.sbin/ypldap/ldapclient.c +++ b/usr.sbin/ypldap/ldapclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldapclient.c,v 1.12 2009/01/27 16:17:49 aschrijver Exp $ */ +/* $OpenBSD: ldapclient.c,v 1.13 2009/01/27 23:29:42 pyr Exp $ */ /* * Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org> @@ -53,10 +53,13 @@ void client_try_server_wrapper(int, short, void *); int client_addr_init(struct idm *); int client_addr_free(struct idm *); -struct aldap *aldap_open(struct ypldap_addr *); +struct aldap *client_aldap_open(struct ypldap_addr *); +/* + * dummy wrapper to provide aldap_init with its fd's. + */ struct aldap * -aldap_open(struct ypldap_addr *addr) +client_aldap_open(struct ypldap_addr *addr) { int fd = -1; struct ypldap_addr *p; @@ -434,7 +437,7 @@ client_try_idm(struct env *env, struct idm *idm) struct aldap *al; where = "connect"; - if ((al = aldap_open(idm->idm_addr)) == NULL) + if ((al = client_aldap_open(idm->idm_addr)) == NULL) return (-1); if (idm->idm_flags & F_NEEDAUTH) { |