--- old/usr/src/common/zfs/zfs_deleg.h
          +++ new/usr/src/common/zfs/zfs_deleg.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26   26  #ifndef _ZFS_DELEG_H
  27   27  #define _ZFS_DELEG_H
  28   28  
  29   29  #pragma ident   "%Z%%M% %I%     %E% SMI"
  30   30  
  31   31  #include <sys/fs/zfs.h>
  32   32  
  33   33  #ifdef  __cplusplus
  34   34  extern "C" {
  35   35  #endif
  36   36  
  37   37  #define ZFS_DELEG_SET_NAME_CHR          '@'             /* set name lead char */
  38   38  #define ZFS_DELEG_FIELD_SEP_CHR         '$'             /* field separator */
  39   39  
  40   40  /*
  41   41   * Max name length for a delegation attribute
  42   42   */
  43   43  #define ZFS_MAX_DELEG_NAME      128
  44   44  
  45   45  #define ZFS_DELEG_LOCAL         'l'
  46   46  #define ZFS_DELEG_DESCENDENT    'd'
  47   47  #define ZFS_DELEG_NA            '-'
  48   48  
  49   49  typedef enum {
  50   50          ZFS_DELEG_NOTE_CREATE,
  51   51          ZFS_DELEG_NOTE_DESTROY,

  52   52          ZFS_DELEG_NOTE_SNAPSHOT,
  53   53          ZFS_DELEG_NOTE_ROLLBACK,
  54   54          ZFS_DELEG_NOTE_CLONE,
  55   55          ZFS_DELEG_NOTE_PROMOTE,
  56   56          ZFS_DELEG_NOTE_RENAME,
  57   57          ZFS_DELEG_NOTE_RECEIVE,
  58   58          ZFS_DELEG_NOTE_ALLOW,
  59   59          ZFS_DELEG_NOTE_USERPROP,
  60   60          ZFS_DELEG_NOTE_MOUNT,
  61   61          ZFS_DELEG_NOTE_SHARE,
       62 +        ZFS_DELEG_NOTE_CRYPTO_DSL,
       63 +        ZFS_DELEG_NOTE_CRYPTO_DSL_CHANGE,
  62   64          ZFS_DELEG_NOTE_NONE
  63   65  } zfs_deleg_note_t;
  64   66  
  65   67  typedef struct zfs_deleg_perm_tab {
  66   68          char *z_perm;
  67   69          zfs_deleg_note_t z_note;
  68   70  } zfs_deleg_perm_tab_t;
  69   71  
  70   72  extern zfs_deleg_perm_tab_t zfs_deleg_perm_tab[];
  71   73  
  72   74  int zfs_deleg_verify_nvlist(nvlist_t *nvlist);
  73   75  void zfs_deleg_whokey(char *attr, zfs_deleg_who_type_t type,
  74   76      char checkflag, void *data);
  75   77  const char *zfs_deleg_canonicalize_perm(const char *perm);
  76   78  
  77   79  #ifdef  __cplusplus
  78   80  }
  79   81  #endif
  80   82  
  81   83  #endif  /* _ZFS_DELEG_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX