2c2
< * Copyright (c) 2001-2004 Sendmail, Inc. and its suppliers.
---
> * Copyright (c) 2001-2005 Sendmail, Inc. and its suppliers.
11c11
< SM_RCSID("@(#)$Id: ldap.c,v 1.60 2004/08/03 20:42:21 ca Exp $")
---
> SM_RCSID("@(#)$Id: ldap.c,v 1.62 2005/02/24 00:30:01 ca Exp $")
592c592,594
< if ((char) delim == '\0' && *result != NULL)
---
> if ((char) delim == '\0' &&
> !bitset(SM_LDAP_SINGLEMATCH, flags) &&
> *result != NULL)
769a772,779
> if (bitset(SM_LDAP_SINGLEMATCH,
> flags))
> {
> /* only wanted one match */
> SM_LDAP_ERROR_CLEANUP();
> errno = ENOENT;
> return EX_NOTFOUND;
> }
773,782d782
< if (bitset(SM_LDAP_SINGLEMATCH,
< flags) &&
< *result != NULL)
< {
< /* only wanted one match */
< SM_LDAP_ERROR_CLEANUP();
< errno = ENOENT;
< return EX_NOTFOUND;
< }
<
993c993,995
< if ((char) delim == '\0' && *result != NULL)
---
> if ((char) delim == '\0' &&
> !bitset(SM_LDAP_SINGLEMATCH, flags) &&
> *result != NULL)