*** 19,29 ****
   * CDDL HEADER END
   */
  
  /*
   * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-  * Copyright (c) 2011, Joyent Inc. All rights reserved.
   */
  
  #ifndef _ZONECFG_H
  #define _ZONECFG_H
  
--- 19,28 ----
*** 89,103 ****
  #define RT_PCAP         24
  #define RT_HOSTID       25      /* really a property, but for info ... */
  #define RT_ADMIN        26
  #define RT_FS_ALLOWED   27
  #define RT_MAXPROCS     28      /* really a rctl alias property, but for info */
- #define RT_ZFSPRI       29      /* really a rctl alias property, but for info */
- #define RT_UUID         30      /* really a property, but for info */
  
  #define RT_MIN          RT_UNKNOWN
! #define RT_MAX          RT_UUID
  
  /* property types: increment PT_MAX when expanding this list */
  #define PT_UNKNOWN      0
  #define PT_ZONENAME     1
  #define PT_ZONEPATH     2
--- 88,100 ----
  #define RT_PCAP         24
  #define RT_HOSTID       25      /* really a property, but for info ... */
  #define RT_ADMIN        26
  #define RT_FS_ALLOWED   27
  #define RT_MAXPROCS     28      /* really a rctl alias property, but for info */
  
  #define RT_MIN          RT_UNKNOWN
! #define RT_MAX          RT_MAXPROCS
  
  /* property types: increment PT_MAX when expanding this list */
  #define PT_UNKNOWN      0
  #define PT_ZONENAME     1
  #define PT_ZONEPATH     2
*** 143,156 ****
  #define PT_ZFSPRI       42
  #define PT_MAC          43
  #define PT_VLANID       44
  #define PT_GNIC         45
  #define PT_NPROP        46
- #define PT_UUID         47
  
  #define PT_MIN          PT_UNKNOWN
! #define PT_MAX          PT_UUID
  
  #define MAX_EQ_PROP_PAIRS       3
  
  #define PROP_VAL_SIMPLE         0
  #define PROP_VAL_COMPLEX        1
--- 140,152 ----
  #define PT_ZFSPRI       42
  #define PT_MAC          43
  #define PT_VLANID       44
  #define PT_GNIC         45
  #define PT_NPROP        46
  
  #define PT_MIN          PT_UNKNOWN
! #define PT_MAX          PT_NPROP
  
  #define MAX_EQ_PROP_PAIRS       3
  
  #define PROP_VAL_SIMPLE         0
  #define PROP_VAL_COMPLEX        1