diff options
| author | joyce mcintosh <Joyce.McIntosh@Sun.COM> | 2010-07-26 15:02:13 -0700 |
|---|---|---|
| committer | joyce mcintosh <Joyce.McIntosh@Sun.COM> | 2010-07-26 15:02:13 -0700 |
| commit | 1fdeec650620e8498c06f832ea4bd2292f7e9632 (patch) | |
| tree | 93e66a90f7f7260ca1086e7701a6c8dc1e46c5fb /usr/src/common/smbclnt/smbfs_ntacl.c | |
| parent | 1a024a4828552f36f41749085bad547c64a0f0a6 (diff) | |
| download | illumos-joyent-1fdeec650620e8498c06f832ea4bd2292f7e9632.tar.gz | |
6779186 need domain controller hot failover
6970986 Level II oplocks - smb_oplock_grant_t shouldn't be dynamically allocated
6971031 Unable add ACL on the share which has only the default owner tab by ZFS
6971899 OpenSSL not MT-safe and takes down smbd
6936762 libidmap should transparently handle interruption in connection to idmapd
6954902 mapping to unknown type does not use directory-based mapping information
--HG--
rename : usr/src/lib/libidmap/common/idmap_priv.h => usr/src/cmd/idmap/idmap/namemaps.h
Diffstat (limited to 'usr/src/common/smbclnt/smbfs_ntacl.c')
| -rw-r--r-- | usr/src/common/smbclnt/smbfs_ntacl.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/usr/src/common/smbclnt/smbfs_ntacl.c b/usr/src/common/smbclnt/smbfs_ntacl.c index 47676da116..6780d891ee 100644 --- a/usr/src/common/smbclnt/smbfs_ntacl.c +++ b/usr/src/common/smbclnt/smbfs_ntacl.c @@ -20,8 +20,7 @@ */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -902,9 +901,6 @@ smbfs_acl_sd2zfs( gid_t own_gid = (gid_t)-1; i_ntacl_t *ntacl; i_ntace_t **ntacep; -#ifndef _KERNEL - idmap_handle_t *idmap_h = NULL; -#endif /* _KERNEL */ idmap_get_handle_t *idmap_gh = NULL; idmap_stat idms; @@ -961,12 +957,7 @@ smbfs_acl_sd2zfs( #ifdef _KERNEL idmap_gh = kidmap_get_create(curproc->p_zone); #else /* _KERNEL */ - idms = idmap_init(&idmap_h); - if (idms != IDMAP_SUCCESS) { - error = ENOTACTIVE; - goto errout; - } - idms = idmap_get_create(idmap_h, &idmap_gh); + idms = idmap_get_create(&idmap_gh); if (idms != IDMAP_SUCCESS) { error = ENOTACTIVE; goto errout; @@ -1147,8 +1138,6 @@ errout: #else /* _KERNEL */ if (idmap_gh != NULL) idmap_get_destroy(idmap_gh); - if (idmap_h != NULL) - (void) idmap_fini(idmap_h); #endif /* _KERNEL */ return (error); @@ -1440,9 +1429,6 @@ smbfs_acl_zfs2sd( i_ntsd_t *sd = NULL; i_ntacl_t *acl = NULL; i_ntace_t **acep = NULL; -#ifndef _KERNEL - idmap_handle_t *idmap_h = NULL; -#endif /* _KERNEL */ idmap_get_handle_t *idmap_gh = NULL; idmap_stat idms; @@ -1499,12 +1485,7 @@ smbfs_acl_zfs2sd( #ifdef _KERNEL idmap_gh = kidmap_get_create(curproc->p_zone); #else /* _KERNEL */ - idms = idmap_init(&idmap_h); - if (idms != IDMAP_SUCCESS) { - error = ENOTACTIVE; - goto errout; - } - idms = idmap_get_create(idmap_h, &idmap_gh); + idms = idmap_get_create(&idmap_gh); if (idms != IDMAP_SUCCESS) { error = ENOTACTIVE; goto errout; @@ -1719,8 +1700,6 @@ errout: #else /* _KERNEL */ if (idmap_gh != NULL) idmap_get_destroy(idmap_gh); - if (idmap_h != NULL) - (void) idmap_fini(idmap_h); #endif /* _KERNEL */ return (error); |