NEX-1767 ls is unable to display SIDs
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
OS-139 POSIX write should imply DELETE_CHILD on directories - and some additional considerations
SMB-50 User-mode SMB server
 Includes work by these authors:
 Thomas Keiser <thomas.keiser@nexenta.com>
 Albert Lee <trisk@nexenta.com>

*** 22,32 ****
   * Copyright 2014 Garrett D'Amore <garrett@damore.org>
   *
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
!  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
   * Copyright 2017 RackTop Systems.
   */
  
  #ifndef _SYS_ACL_H
  #define _SYS_ACL_H
--- 22,32 ----
   * Copyright 2014 Garrett D'Amore <garrett@damore.org>
   *
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
!  * Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
   * Copyright 2017 RackTop Systems.
   */
  
  #ifndef _SYS_ACL_H
  #define _SYS_ACL_H
*** 250,263 ****
  
  /*
   * Flags to control acl_totext()
   */
  
! #define ACL_APPEND_ID   0x1     /* append uid/gid to user/group entries */
! #define ACL_COMPACT_FMT 0x2     /* build ACL in ls -V format */
! #define ACL_NORESOLVE   0x4     /* don't do name service lookups */
! #define ACL_SID_FMT     0x8     /* use usersid/groupsid when appropriate */
  
  /*
   * Legacy aclcheck errors for aclent_t ACLs
   */
  #define EACL_GRP_ERROR          GRP_ERROR
--- 250,264 ----
  
  /*
   * Flags to control acl_totext()
   */
  
! #define ACL_APPEND_ID   0x01    /* append uid/gid to user/group entries */
! #define ACL_COMPACT_FMT 0x02    /* build ACL in ls -V format */
! #define ACL_NORESOLVE   0x04    /* don't do name service lookups */
! #define ACL_SID_FMT     0x08    /* use usersid/groupsid when appropriate */
! #define ACL_EPHEMERAL   0x10    /* Print raw ephemeral id */
  
  /*
   * Legacy aclcheck errors for aclent_t ACLs
   */
  #define EACL_GRP_ERROR          GRP_ERROR