Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/common/zfs/zfs_deleg.c
          +++ new/usr/src/common/zfs/zfs_deleg.c
↓ open down ↓ 58 lines elided ↑ open up ↑
  59   59          {ZFS_DELEG_PERM_DESTROY, ZFS_DELEG_NOTE_DESTROY },
  60   60          {ZFS_DELEG_PERM_MOUNT, ZFS_DELEG_NOTE_MOUNT },
  61   61          {ZFS_DELEG_PERM_PROMOTE, ZFS_DELEG_NOTE_PROMOTE },
  62   62          {ZFS_DELEG_PERM_RECEIVE, ZFS_DELEG_NOTE_RECEIVE },
  63   63          {ZFS_DELEG_PERM_RENAME, ZFS_DELEG_NOTE_RENAME },
  64   64          {ZFS_DELEG_PERM_ROLLBACK, ZFS_DELEG_NOTE_ROLLBACK },
  65   65          {ZFS_DELEG_PERM_SNAPSHOT, ZFS_DELEG_NOTE_SNAPSHOT },
  66   66          {ZFS_DELEG_PERM_SHARE, ZFS_DELEG_NOTE_SHARE },
  67   67          {ZFS_DELEG_PERM_SEND, ZFS_DELEG_NOTE_NONE },
  68   68          {ZFS_DELEG_PERM_USERPROP, ZFS_DELEG_NOTE_USERPROP },
       69 +        {ZFS_DELEG_PERM_CRYPTO_DSL, ZFS_DELEG_NOTE_CRYPTO_DSL },
       70 +        {ZFS_DELEG_PERM_CRYPTO_DSL_CHANGE, ZFS_DELEG_NOTE_CRYPTO_DSL_CHANGE },
  69   71          {NULL, ZFS_DELEG_NOTE_NONE }
  70   72  };
  71   73  
  72   74  static int
  73   75  zfs_valid_permission_name(const char *perm)
  74   76  {
  75   77          if (zfs_deleg_canonicalize_perm(perm))
  76   78                  return (0);
  77   79  
  78   80          return (permset_namecheck(perm, NULL, NULL));
↓ open down ↓ 156 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX