summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authorMatt Barden <matt.barden@nexenta.com>2018-10-10 20:27:21 -0400
committerGordon Ross <gwr@nexenta.com>2019-06-01 12:44:37 -0400
commit6a9f16736155acc477a23d23c677ba93631347dd (patch)
treef2a68d2a30953a8962e26ee22e45d2a4258fb6d6 /usr/src/lib
parenta01d29c934f6c146f2cc5bacb5d1d388c27a1257 (diff)
downloadillumos-joyent-6a9f16736155acc477a23d23c677ba93631347dd.tar.gz
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>
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/nsswitch/ldap/common/ldap_common.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/usr/src/lib/nsswitch/ldap/common/ldap_common.c b/usr/src/lib/nsswitch/ldap/common/ldap_common.c
index f654580e56..58e12cdd99 100644
--- a/usr/src/lib/nsswitch/ldap/common/ldap_common.c
+++ b/usr/src/lib/nsswitch/ldap/common/ldap_common.c
@@ -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 @@ switch_err(int rc, ns_ldap_error_t *error)
return (NSS_SUCCESS);
case NS_LDAP_NOTFOUND:
+ errno = 0;
return (NSS_NOTFOUND);
case NS_LDAP_PARTIAL:
@@ -124,10 +125,10 @@ switch_err(int rc, ns_ldap_error_t *error)
/* 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 @@ error_out:
/* 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 @@ error_out:
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;