Print this page
NEX-16818 Add fksmbcl development tool
NEX-17264 SMB client test tp_smbutil_013 fails after NEX-14666
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
and: (fix ref leaks)
        
*** 20,29 ****
--- 20,31 ----
   */
  
  /*
   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  *
+  * Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
   */
  
  #ifndef _SMBFS_NTACL_H
  #define _SMBFS_NTACL_H
  
*** 120,130 ****
  
  /*
   * Convert an internal SD to a ZFS-style ACL.
   * Get uid/gid too if pointers != NULL.
   */
! #ifdef  _KERNEL
  int smbfs_acl_sd2zfs(i_ntsd_t *, vsecattr_t *, uid_t *, gid_t *);
  #else /* _KERNEL */
  /* See also: lib/libsmbfs/netsmb/smbfs_acl.h */
  int smbfs_acl_sd2zfs(struct i_ntsd *, acl_t *, uid_t *, gid_t *);
  #endif /* _KERNEL */
--- 122,132 ----
  
  /*
   * Convert an internal SD to a ZFS-style ACL.
   * Get uid/gid too if pointers != NULL.
   */
! #if defined(_KERNEL) || defined(_FAKE_KERNEL)
  int smbfs_acl_sd2zfs(i_ntsd_t *, vsecattr_t *, uid_t *, gid_t *);
  #else /* _KERNEL */
  /* See also: lib/libsmbfs/netsmb/smbfs_acl.h */
  int smbfs_acl_sd2zfs(struct i_ntsd *, acl_t *, uid_t *, gid_t *);
  #endif /* _KERNEL */
*** 134,144 ****
   * Set owner/group too if selector indicates.
   * Always need to pass uid+gid, either the new
   * (when setting them) or existing, so that any
   * owner@ or group@ ACEs can be translated.
   */
! #ifdef  _KERNEL
  int smbfs_acl_zfs2sd(vsecattr_t *, uid_t, gid_t, uint32_t, i_ntsd_t **);
  #else /* _KERNEL */
  /* See also: lib/libsmbfs/netsmb/smbfs_acl.h */
  int smbfs_acl_zfs2sd(acl_t *, uid_t, gid_t, uint32_t, struct i_ntsd **);
  #endif /* _KERNEL */
--- 136,146 ----
   * Set owner/group too if selector indicates.
   * Always need to pass uid+gid, either the new
   * (when setting them) or existing, so that any
   * owner@ or group@ ACEs can be translated.
   */
! #if defined(_KERNEL) || defined(_FAKE_KERNEL)
  int smbfs_acl_zfs2sd(vsecattr_t *, uid_t, gid_t, uint32_t, i_ntsd_t **);
  #else /* _KERNEL */
  /* See also: lib/libsmbfs/netsmb/smbfs_acl.h */
  int smbfs_acl_zfs2sd(acl_t *, uid_t, gid_t, uint32_t, struct i_ntsd **);
  #endif /* _KERNEL */