Mercurial > illumos > git > illumos-omnios
changeset 21406:c2d4708b2856
10996 SMB can't view ACL if posix ID can't be mapped
Review by: Gordon Ross <gordon.ross@nexenta.com>
Review by: Evan Layton <evan.layton@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| author | Matt Barden <matt.barden@nexenta.com> |
|---|---|
| date | Wed, 10 Oct 2018 20:27:21 -0400 |
| parents | afafd6629b96 |
| children | 067682ab8452 |
| files | usr/src/lib/nsswitch/ldap/common/ldap_common.c |
| diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/nsswitch/ldap/common/ldap_common.c Wed Jul 18 19:14:58 2018 -0400 +++ b/usr/src/lib/nsswitch/ldap/common/ldap_common.c Wed Oct 10 20:27:21 2018 -0400 @@ -20,7 +20,7 @@ */ /* * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2017 Nexenta Systems, Inc. All rights reserved. + * Copyright 2018 Nexenta Systems, Inc. All rights reserved. */ #include "ldap_common.h" @@ -105,6 +105,7 @@ return (NSS_SUCCESS); case NS_LDAP_NOTFOUND: + errno = 0; return (NSS_NOTFOUND); case NS_LDAP_PARTIAL: @@ -124,10 +125,10 @@ /* ARGSUSED */ nss_status_t _nss_ldap_lookup(ldap_backend_ptr be, nss_XbyY_args_t *argp, - char *database, char *searchfilter, char *domain, - int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, - char **realfilter, const void *userdata), - const void *userdata) + char *database, char *searchfilter, char *domain, + int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, + char **realfilter, const void *userdata), + const void *userdata) { int callbackstat = 0; ns_ldap_error_t *error = NULL; @@ -247,10 +248,10 @@ /* ARGSUSED */ nss_status_t _nss_ldap_nocb_lookup(ldap_backend_ptr be, nss_XbyY_args_t *argp, - char *database, char *searchfilter, const char * const *attrs, - int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, - char **realfilter, const void *userdata), - const void *userdata) + char *database, char *searchfilter, const char * const *attrs, + int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, + char **realfilter, const void *userdata), + const void *userdata) { ns_ldap_error_t *error = NULL; int rc; @@ -535,7 +536,7 @@ nss_backend_t * _nss_ldap_constr(ldap_backend_op_t ops[], int nops, char *tablename, - const char **attrs, fnf ldapobj2str) + const char **attrs, fnf ldapobj2str) { ldap_backend_ptr be;