dns2 ui replaceing calls for the dns plugin to the dns2 plugin no has attribute permissions and all other benefits of building on the baseldap plugin

9 files changed, 1351 insertions, 164 deletions

diff --git a/install/static/policy.js b/install/static/policy.js
index db60e10a3..18c4ef550 100644
--- a/install/static/policy.js
+++ b/install/static/policy.js
@@ -21,12 +21,12 @@
 /* REQUIRES: ipa.js, details.js, search.js, add.js, entity.js */
 
 /* DNS */
-ipa_entity_set_search_definition('dns', [
+ipa_entity_set_search_definition('dnszone', [
     ['idnsname', 'Zone Name', null]
 ]);
 
 
-ipa_entity_set_add_definition('dns', [
+ipa_entity_set_add_definition('dnszone', [
     'dialog-add-dns', 'Add New Zone', [
         ['idnsname', 'Name', null],
         ['idnssoamname', 'Authoritative name server'],
@@ -34,7 +34,7 @@ ipa_entity_set_add_definition('dns', [
     ]
 ]);
 
-ipa_entity_set_details_definition('dns', [
+ipa_entity_set_details_definition('dnszone', [
     ipa_stanza({name:'identity', label:'DNS Zone Details'}).
         input({name:'idnsname', label:'DNS Name'}).
         input({name:'idnszoneactive', label:'Zone Active'}).
@@ -51,11 +51,11 @@ ipa_entity_set_details_definition('dns', [
         input({name:'idnsupdatepolicy', label:'BIND update policy'})
 ]);
 
-ipa_entity_set_association_definition('dns', {
+ipa_entity_set_association_definition('dnszone', {
 });
 
 
-ipa_entity_set_facet_definition('dns', [
+ipa_entity_set_facet_definition('dnszone', [
     ipa_records_facet({
         'name': 'records',
         'label': 'Records'
@@ -133,12 +133,16 @@ function ipa_records_facet(spec){
             function add_fail(data, text_status, xhr) {
             }
 
-            params.push(  $.bbq.getState('dns-pkey', true));
+            params.push(  $.bbq.getState(that.entity_name+'-pkey', true));
             params.push(add_dialog.find('#dns-record-resource').val());
-            params.push(add_dialog.find('#dns-record-type').val());
-            params.push(add_dialog.find('#dns-record-data').val());
 
-            ipa_cmd('dns_add_rr', params, options, add_win, add_fail);
+            var key =  add_dialog.find('#dns-record-type').val().toLowerCase()+
+                "record";
+            var value = add_dialog.find('#dns-record-data').val();
+            options[key] = value;
+
+
+            ipa_cmd('dnsrecord_add', params, options, add_win, add_fail);
             //add_dialog.dialog('close');
         }
 
@@ -166,7 +170,7 @@ function ipa_records_facet(spec){
 
     function delete_records(records_table){
 
-        var zone = $.bbq.getState('dns-pkey', true);
+        var zone = $.bbq.getState('dnszone-pkey', true);
 
         var thead = records_table.find('thead');
         thead.find("INPUT[type='checkbox']").
@@ -193,10 +197,17 @@ function ipa_records_facet(spec){
                     var tr = $(box).parents('tr');
                     var resource = $(tr).find('[title="idnsname"]').text();
                     var type = $(tr).find('[title="type"]').
-                        text().toUpperCase();
+                        text().toLowerCase();
                     var data = $(tr).find('[title="data"]').text();
-                    var params = [zone, resource, type, data];
-                    delete_list.push(params);
+                    var rectype=type+"record"
+
+                    var options = {};
+                    options[rectype]=data;
+
+                    var command = {
+                        "method":"dnsrecord_del",
+                        "params":[[zone,resource], options]};
+                    delete_list.push(command);
                     to_delete_body.append(
                         $('<tr></tr>').
                             append($('<td></td>',{html:resource}).
@@ -208,16 +219,12 @@ function ipa_records_facet(spec){
         function delete_on_click() {
             var delete_count = delete_list.length;
             function delete_complete(){
-                delete_count -= 1;
-                if (delete_count === 0 ){
                     reload();
                     delete_dialog.dialog('close');
-                }
-            }
-            for (var i = 0; i < delete_list.length; i += 1){
-                ipa_cmd('dns_del_rr',delete_list[i],{},
-                        delete_complete,delete_complete);
             }
+
+            ipa_cmd('batch', delete_list, {},
+                    delete_complete,delete_complete);
         }
 
         function cancel_on_click() {
@@ -297,17 +304,25 @@ function ipa_records_facet(spec){
             'click': function(){refresh()}
         }).appendTo(control_span);
 
+        var action_panel_ul = $('.action-panel ul', that.container);
+
+        var action_controls =  $('<li/>',{
+            "class":"action-controls"}).appendTo(action_panel_ul);
+
+
         ipa_button({
             'label': IPA.messages.button.add,
             'icon': 'ui-icon-plus',
             'click': add_click
-        }).appendTo(control_span);
+        }).appendTo(action_controls);
 
         ipa_button({
             'label': IPA.messages.button.remove,
             'icon': 'ui-icon-trash',
             'click': function(){delete_records(records_table);}
-        }).appendTo(control_span);
+        }).appendTo(action_controls);
+
+
 
 
         div.append('<span class="records-buttons"></span>');
@@ -343,11 +358,11 @@ function ipa_records_facet(spec){
 
 
     function load_on_win(data){
-        display('dns',data);
+        display(that.entity_name,data);
     }
 
     function load_on_fail(data){
-        display('dns',data);
+        display(that.entity_name,data);
     }
 
     function  reload(){
@@ -376,8 +391,8 @@ function ipa_records_facet(spec){
         }
 
 
-        var pkey = $.bbq.getState('dns' + '-pkey', true);
-        ipa_cmd('dns_find_rr',[pkey],options,load_on_win, load_on_fail);
+        var pkey = $.bbq.getState(that.entity_name + '-pkey', true);
+        ipa_cmd('dnsrecord_find',[pkey],options,load_on_win, load_on_fail);
 
     }
 
diff --git a/install/static/test/data/dnsrecord_add.json b/install/static/test/data/dnsrecord_add.json
new file mode 100644
index 000000000..968d3f606
--- /dev/null
+++ b/install/static/test/data/dnsrecord_add.json
@@ -0,0 +1,21 @@
+{
+    "error": null,
+    "id": 12,
+    "result": {
+        "result": {
+            "arecord": [
+                "1.2.3.4"
+            ],
+            "dn": "idnsname=a4,idnsname=henson.ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "idnsname": [
+                "a4"
+            ],
+            "objectclass": [
+                "top",
+                "idnsrecord"
+            ]
+        },
+        "summary": null,
+        "value": "a4"
+    }
+}
\ No newline at end of file
diff --git a/install/static/test/data/dnsrecord_del.json b/install/static/test/data/dnsrecord_del.json
new file mode 100644
index 000000000..93a53627c
--- /dev/null
+++ b/install/static/test/data/dnsrecord_del.json
@@ -0,0 +1,10 @@
+{
+    "error": null,
+    "result": {
+        "idnsname": [
+            "@"
+        ]
+    },
+    "summary": null,
+    "value": "@"
+ }
diff --git a/install/static/test/data/dnsrecord_find.json b/install/static/test/data/dnsrecord_find.json
new file mode 100644
index 000000000..1d64b3abb
--- /dev/null
+++ b/install/static/test/data/dnsrecord_find.json
@@ -0,0 +1,110 @@
+{
+    "error": null,
+    "id": 10,
+    "result": {
+        "count": 11,
+        "result": [
+            {
+                "dn": "idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "@"
+                ],
+                "nsrecord": [
+                    "ipa.ayoung.boston.devel.redhat.com."
+                ]
+            },
+            {
+                "arecord": [
+                    "192.168.122.81"
+                ],
+                "dn": "idnsname=ipa,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_ldap._tcp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_ldap._tcp"
+                ],
+                "srvrecord": [
+                    "0 100 389 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_kerberos,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kerberos"
+                ],
+                "txtrecord": [
+                    "AYOUNG.BOSTON.DEVEL.REDHAT.COM"
+                ]
+            },
+            {
+                "dn": "idnsname=_kerberos._tcp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kerberos._tcp"
+                ],
+                "srvrecord": [
+                    "0 100 88 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_kerberos._udp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kerberos._udp"
+                ],
+                "srvrecord": [
+                    "0 100 88 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_kerberos-master._tcp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kerberos-master._tcp"
+                ],
+                "srvrecord": [
+                    "0 100 88 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_kerberos-master._udp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kerberos-master._udp"
+                ],
+                "srvrecord": [
+                    "0 100 88 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_kpasswd._tcp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kpasswd._tcp"
+                ],
+                "srvrecord": [
+                    "0 100 464 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_kpasswd._udp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_kpasswd._udp"
+                ],
+                "srvrecord": [
+                    "0 100 464 ipa"
+                ]
+            },
+            {
+                "dn": "idnsname=_ntp._udp,idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsname": [
+                    "_ntp._udp"
+                ],
+                "srvrecord": [
+                    "0 100 123 ipa"
+                ]
+            }
+        ],
+        "summary": null,
+        "truncated": false
+    }
+}
\ No newline at end of file
diff --git a/install/static/test/data/dnszone_add.json b/install/static/test/data/dnszone_add.json
new file mode 100644
index 000000000..6870acc5b
--- /dev/null
+++ b/install/static/test/data/dnszone_add.json
@@ -0,0 +1,46 @@
+{
+    "error": null,
+    "id": 3,
+    "result": {
+        "result": {
+            "dn": "idnsname=henson.ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "idnsallowdynupdate": [
+                "FALSE"
+            ],
+            "idnsname": [
+                "henson.ayoung.boston.devel.redhat.com"
+            ],
+            "idnssoaexpire": [
+                "1209600"
+            ],
+            "idnssoaminimum": [
+                "3600"
+            ],
+            "idnssoamname": [
+                "ayoung.boston.devel.redhat.com"
+            ],
+            "idnssoarefresh": [
+                "3600"
+            ],
+            "idnssoaretry": [
+                "900"
+            ],
+            "idnssoarname": [
+                "root.henson.ayoung.boston.devel.redhat.com."
+            ],
+            "idnssoaserial": [
+                "2010021201"
+            ],
+            "idnszoneactive": [
+                "TRUE"
+            ],
+            "objectclass": [
+                "top",
+                "idnsrecord",
+                "idnszone"
+            ]
+        },
+        "summary": null,
+        "value": "henson.ayoung.boston.devel.redhat.com"
+    }
+}
\ No newline at end of file
diff --git a/install/static/test/data/dnszone_find.json b/install/static/test/data/dnszone_find.json
new file mode 100644
index 000000000..b8f76d417
--- /dev/null
+++ b/install/static/test/data/dnszone_find.json
@@ -0,0 +1,137 @@
+{
+    "error": null,
+    "id": 6,
+    "result": {
+        "count": 3,
+        "result": [
+            {
+                "dn": "idnsname=ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsallowdynupdate": [
+                    "TRUE"
+                ],
+                "idnsname": [
+                    "ayoung.boston.devel.redhat.com"
+                ],
+                "idnssoaexpire": [
+                    "1209600"
+                ],
+                "idnssoaminimum": [
+                    "3600"
+                ],
+                "idnssoamname": [
+                    "ipa.ayoung.boston.devel.redhat.com."
+                ],
+                "idnssoarefresh": [
+                    "3600"
+                ],
+                "idnssoaretry": [
+                    "900"
+                ],
+                "idnssoarname": [
+                    "root.ipa.ayoung.boston.devel.redhat.com."
+                ],
+                "idnssoaserial": [
+                    "2010021201"
+                ],
+                "idnsupdatepolicy": [
+                    "grant AYOUNG.BOSTON.DEVEL.REDHAT.COM krb5-self * A;"
+                ],
+                "idnszoneactive": [
+                    "TRUE"
+                ],
+                "nsrecord": [
+                    "ipa.ayoung.boston.devel.redhat.com."
+                ],
+                "objectclass": [
+                    "top",
+                    "idnsrecord",
+                    "idnszone"
+                ]
+            },
+            {
+                "dn": "idnsname=122.168.192.in-addr.arpa,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsallowdynupdate": [
+                    "TRUE"
+                ],
+                "idnsname": [
+                    "122.168.192.in-addr.arpa"
+                ],
+                "idnssoaexpire": [
+                    "1209600"
+                ],
+                "idnssoaminimum": [
+                    "3600"
+                ],
+                "idnssoamname": [
+                    "ipa.ayoung.boston.devel.redhat.com."
+                ],
+                "idnssoarefresh": [
+                    "3600"
+                ],
+                "idnssoaretry": [
+                    "900"
+                ],
+                "idnssoarname": [
+                    "root.122.168.192.in-addr.arpa."
+                ],
+                "idnssoaserial": [
+                    "2010021201"
+                ],
+                "idnsupdatepolicy": [
+                    "grant AYOUNG.BOSTON.DEVEL.REDHAT.COM krb5-subdomain 122.168.192.in-addr.arpa. PTR;"
+                ],
+                "idnszoneactive": [
+                    "TRUE"
+                ],
+                "nsrecord": [
+                    "ipa.ayoung.boston.devel.redhat.com."
+                ],
+                "objectclass": [
+                    "top",
+                    "idnsrecord",
+                    "idnszone"
+                ]
+            },
+            {
+                "dn": "idnsname=henson.ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "idnsallowdynupdate": [
+                    "FALSE"
+                ],
+                "idnsname": [
+                    "henson.ayoung.boston.devel.redhat.com"
+                ],
+                "idnssoaexpire": [
+                    "1209600"
+                ],
+                "idnssoaminimum": [
+                    "3600"
+                ],
+                "idnssoamname": [
+                    "ayoung.boston.devel.redhat.com"
+                ],
+                "idnssoarefresh": [
+                    "3600"
+                ],
+                "idnssoaretry": [
+                    "900"
+                ],
+                "idnssoarname": [
+                    "root.henson.ayoung.boston.devel.redhat.com."
+                ],
+                "idnssoaserial": [
+                    "2010021201"
+                ],
+                "idnszoneactive": [
+                    "TRUE"
+                ],
+                "objectclass": [
+                    "top",
+                    "idnsrecord",
+                    "idnszone"
+                ]
+            }
+        ],
+        "summary": null,
+        "truncated": false
+    }
+}
\ No newline at end of file
diff --git a/install/static/test/data/dnszone_show.json b/install/static/test/data/dnszone_show.json
new file mode 100644
index 000000000..35e507627
--- /dev/null
+++ b/install/static/test/data/dnszone_show.json
@@ -0,0 +1,90 @@
+{
+    "error": null,
+    "id": 7,
+    "result": {
+        "result": {
+            "attributelevelrights": {
+                "a6record": "rscwo",
+                "aaaarecord": "rscwo",
+                "aci": "rscwo",
+                "afsdbrecord": "rscwo",
+                "arecord": "rscwo",
+                "certrecord": "rscwo",
+                "cn": "rscwo",
+                "cnamerecord": "rscwo",
+                "dnamerecord": "rscwo",
+                "dnsclass": "rscwo",
+                "dnsttl": "rscwo",
+                "dsrecord": "rscwo",
+                "hinforecord": "rscwo",
+                "idnsallowdynupdate": "rscwo",
+                "idnsname": "rscwo",
+                "idnssoaexpire": "rscwo",
+                "idnssoaminimum": "rscwo",
+                "idnssoamname": "rscwo",
+                "idnssoarefresh": "rscwo",
+                "idnssoaretry": "rscwo",
+                "idnssoarname": "rscwo",
+                "idnssoaserial": "rscwo",
+                "idnsupdatepolicy": "rscwo",
+                "idnszoneactive": "rscwo",
+                "keyrecord": "rscwo",
+                "kxrecord": "rscwo",
+                "locrecord": "rscwo",
+                "mdrecord": "rscwo",
+                "minforecord": "rscwo",
+                "mxrecord": "rscwo",
+                "naptrrecord": "rscwo",
+                "nsaccountlock": "rscwo",
+                "nsecrecord": "rscwo",
+                "nsrecord": "rscwo",
+                "nxtrecord": "rscwo",
+                "objectclass": "rscwo",
+                "ptrrecord": "rscwo",
+                "rrsigrecord": "rscwo",
+                "sigrecord": "rscwo",
+                "srvrecord": "rscwo",
+                "sshfprecord": "rscwo",
+                "txtrecord": "rscwo"
+            },
+            "dn": "idnsname=henson.ayoung.boston.devel.redhat.com,cn=dns,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "idnsallowdynupdate": [
+                "FALSE"
+            ],
+            "idnsname": [
+                "henson.ayoung.boston.devel.redhat.com"
+            ],
+            "idnssoaexpire": [
+                "1209600"
+            ],
+            "idnssoaminimum": [
+                "3600"
+            ],
+            "idnssoamname": [
+                "ayoung.boston.devel.redhat.com"
+            ],
+            "idnssoarefresh": [
+                "3600"
+            ],
+            "idnssoaretry": [
+                "900"
+            ],
+            "idnssoarname": [
+                "root.henson.ayoung.boston.devel.redhat.com."
+            ],
+            "idnssoaserial": [
+                "2010021201"
+            ],
+            "idnszoneactive": [
+                "TRUE"
+            ],
+            "objectclass": [
+                "top",
+                "idnsrecord",
+                "idnszone"
+            ]
+        },
+        "summary": null,
+        "value": "henson.ayoung.boston.devel.redhat.com"
+    }
+}
\ No newline at end of file
diff --git a/install/static/test/data/ipa_init.json b/install/static/test/data/ipa_init.json
index 1de684904..b868df883 100644
--- a/install/static/test/data/ipa_init.json
+++ b/install/static/test/data/ipa_init.json
@@ -990,6 +990,513 @@
                             }
                         ]
                     },
+                    "dnsrecord": {
+                        "attribute_members": {},
+                        "container_dn": "cn=dns",
+                        "default_attributes": [
+                            "arecord",
+                            "aaaarecord",
+                            "a6record",
+                            "afsdbrecord",
+                            "aplrecord",
+                            "certrecord",
+                            "cnamerecord",
+                            "dhcidrecord",
+                            "dlvrecord",
+                            "dnamerecord",
+                            "dnskeyrecord",
+                            "dsrecord",
+                            "hinforecord",
+                            "hiprecord",
+                            "ipseckeyrecord",
+                            "keyrecord",
+                            "kxrecord",
+                            "locrecord",
+                            "mdrecord",
+                            "minforecord",
+                            "mxrecord",
+                            "naptrrecord",
+                            "nsrecord",
+                            "nsecrecord",
+                            "nsec3record",
+                            "nsec3paramrecord",
+                            "nxtrecord",
+                            "ptrrecord",
+                            "rrsigrecord",
+                            "rprecord",
+                            "sigrecord",
+                            "spfrecord",
+                            "srvrecord",
+                            "sshfprecord",
+                            "tarecord",
+                            "tkeyrecord",
+                            "tsigrecord",
+                            "txtrecord",
+                            "idnsname"
+                        ],
+                        "hidden_attributes": [
+                            "objectclass",
+                            "aci"
+                        ],
+                        "label": "DNS resource record",
+                        "methods": [
+                            "add",
+                            "add_record",
+                            "del",
+                            "delentry",
+                            "find",
+                            "show"
+                        ],
+                        "name": "dnsrecord",
+                        "object_class": [
+                            "top",
+                            "idnsrecord"
+                        ],
+                        "object_class_config": null,
+                        "object_name": "DNS resource record",
+                        "object_name_plural": "DNS resource records",
+                        "parent_object": "dnszone",
+                        "primary_key": "idnsname",
+                        "rdn_attribute": "",
+                        "takes_params": [
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "name",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Record name",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Record name",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "idnsname",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": true,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "ttl",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time to live",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time to live",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "dnsttl",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "StrEnum",
+                                "cli_name": "class",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "DNS class",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Class",
+                                "multivalue": false,
+                                "name": "dnsclass",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode",
+                                "values": [
+                                    "IN",
+                                    "CS",
+                                    "CH",
+                                    "HS"
+                                ]
+                            }
+                        ],
+                        "uuid_attribute": ""
+                    },
+                    "dnszone": {
+                        "attribute_members": {},
+                        "container_dn": "cn=dns",
+                        "default_attributes": [
+                            "idnsname",
+                            "idnszoneactive",
+                            "idnssoamname",
+                            "idnssoarname",
+                            "idnssoaserial",
+                            "idnssoarefresh",
+                            "idnssoaretry",
+                            "idnssoaexpire",
+                            "idnssoaminimum",
+                            "arecord",
+                            "aaaarecord",
+                            "a6record",
+                            "afsdbrecord",
+                            "aplrecord",
+                            "certrecord",
+                            "cnamerecord",
+                            "dhcidrecord",
+                            "dlvrecord",
+                            "dnamerecord",
+                            "dnskeyrecord",
+                            "dsrecord",
+                            "hinforecord",
+                            "hiprecord",
+                            "ipseckeyrecord",
+                            "keyrecord",
+                            "kxrecord",
+                            "locrecord",
+                            "mdrecord",
+                            "minforecord",
+                            "mxrecord",
+                            "naptrrecord",
+                            "nsrecord",
+                            "nsecrecord",
+                            "nsec3record",
+                            "nsec3paramrecord",
+                            "nxtrecord",
+                            "ptrrecord",
+                            "rrsigrecord",
+                            "rprecord",
+                            "sigrecord",
+                            "spfrecord",
+                            "srvrecord",
+                            "sshfprecord",
+                            "tarecord",
+                            "tkeyrecord",
+                            "tsigrecord",
+                            "txtrecord"
+                        ],
+                        "hidden_attributes": [
+                            "objectclass",
+                            "aci"
+                        ],
+                        "label": "DNS zone",
+                        "methods": [
+                            "add",
+                            "del",
+                            "disable",
+                            "enable",
+                            "find",
+                            "mod",
+                            "show"
+                        ],
+                        "name": "dnszone",
+                        "object_class": [
+                            "top",
+                            "idnsrecord",
+                            "idnszone"
+                        ],
+                        "object_class_config": null,
+                        "object_name": "DNS zone",
+                        "object_name_plural": "DNS zones",
+                        "parent_object": "",
+                        "primary_key": "idnsname",
+                        "rdn_attribute": "",
+                        "takes_params": [
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "name",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Zone name (FQDN)",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Zone name",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "idnsname",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": true,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "name_server",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Authoritative name server",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Authoritative name server",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "idnssoamname",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "admin_email",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Administrator e-mail address",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Administrator e-mail address",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "idnssoarname",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Int",
+                                "cli_name": "serial",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "SOA record serial number",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA serial",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "idnssoaserial",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Int",
+                                "cli_name": "refresh",
+                                "cli_short_name": null,
+                                "default": 3600,
+                                "doc": "SOA record refresh time",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA refresh",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "idnssoarefresh",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Int",
+                                "cli_name": "retry",
+                                "cli_short_name": null,
+                                "default": 900,
+                                "doc": "SOA record retry time",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA retry",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "idnssoaretry",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Int",
+                                "cli_name": "expire",
+                                "cli_short_name": null,
+                                "default": 1209600,
+                                "doc": "SOA record expire time",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA expire",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "idnssoaexpire",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Int",
+                                "cli_name": "minimum",
+                                "cli_short_name": null,
+                                "default": 3600,
+                                "doc": "SOA record minimum value",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA minimum",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "idnssoaminimum",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "maximum",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "SOA record maximum value",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA maximum",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "idnssoamaximum",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "ttl",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "SOA record time to live",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA time to live",
+                                "maxvalue": null,
+                                "minvalue": null,
+                                "multivalue": false,
+                                "name": "dnsttl",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "StrEnum",
+                                "cli_name": "class",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "SOA record class",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "SOA class",
+                                "multivalue": false,
+                                "name": "dnsclass",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode",
+                                "values": [
+                                    "IN",
+                                    "CS",
+                                    "CH",
+                                    "HS"
+                                ]
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "update_policy",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "BIND update policy",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "BIND update policy",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "idnsupdatepolicy",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ],
+                        "uuid_attribute": ""
+                    },
                     "group": {
                         "attribute_members": {
                             "member": [
@@ -1000,14 +1507,12 @@
                                 "user",
                                 "group",
                                 "netgroup",
-                                "rolegroup",
-                                "taskgroup"
+                                "role"
                             ],
                             "memberof": [
                                 "group",
                                 "netgroup",
-                                "rolegroup",
-                                "taskgroup"
+                                "role"
                             ]
                         },
                         "container_dn": "cn=groups,cn=accounts",
@@ -1782,7 +2287,7 @@
                             "memberof": [
                                 "hostgroup",
                                 "netgroup",
-                                "rolegroup"
+                                "role"
                             ]
                         },
                         "container_dn": "cn=computers,cn=accounts",
@@ -2534,9 +3039,372 @@
                         ],
                         "uuid_attribute": "ipauniqueid"
                     },
+                    "permission": {
+                        "attribute_members": {
+                            "member": [
+                                "privilege"
+                            ]
+                        },
+                        "container_dn": "cn=permissions,cn=accounts",
+                        "default_attributes": [
+                            "cn",
+                            "description",
+                            "member",
+                            "memberof",
+                            "memberindirect"
+                        ],
+                        "hidden_attributes": [
+                            "objectclass",
+                            "aci"
+                        ],
+                        "label": "Permissions",
+                        "methods": [
+                            "add",
+                            "add_member",
+                            "del",
+                            "find",
+                            "mod",
+                            "remove_member",
+                            "show"
+                        ],
+                        "name": "permission",
+                        "object_class": [
+                            "groupofnames"
+                        ],
+                        "object_class_config": null,
+                        "object_name": "permission",
+                        "object_name_plural": "permissions",
+                        "parent_object": "",
+                        "primary_key": "cn",
+                        "rdn_attribute": "",
+                        "takes_params": [
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "name",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Permission name",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Permission name",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "cn",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": true,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "desc",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Permission description",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Description",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "description",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "List",
+                                "cli_name": "permissions",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Comma-separated list of permissions to grant (read, write, add, delete, all)",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Permissions",
+                                "multivalue": true,
+                                "name": "permissions",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "separator": ",",
+                                "skipspace": true,
+                                "type": "tuple"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "List",
+                                "cli_name": "attrs",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Comma-separated list of attributes",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Attributes",
+                                "multivalue": true,
+                                "name": "attrs",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "separator": ",",
+                                "skipspace": true,
+                                "type": "tuple"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "StrEnum",
+                                "cli_name": "type",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Type of IPA object (user, group, host, hostgroup, service, netgroup)",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Type",
+                                "multivalue": false,
+                                "name": "type",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode",
+                                "values": [
+                                    "user",
+                                    "group",
+                                    "host",
+                                    "service",
+                                    "hostgroup",
+                                    "netgroup"
+                                ]
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "memberof",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Target members of a group",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Member of group",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "memberof",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "filter",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Legal LDAP filter (e.g. ou=Engineering)",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Filter",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "filter",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "subtree",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Subtree to apply permissions to",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Subtree",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "subtree",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "targetgroup",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "User group to apply permissions to",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Target group",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "targetgroup",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ],
+                        "uuid_attribute": ""
+                    },
                     "pkinit": {
                         "__base64__": ""
                     },
+                    "privilege": {
+                        "attribute_members": {
+                            "member": [
+                                "permission",
+                                "role"
+                            ],
+                            "memberof": [
+                                "permission"
+                            ]
+                        },
+                        "container_dn": "cn=privileges,cn=accounts",
+                        "default_attributes": [
+                            "cn",
+                            "description",
+                            "member",
+                            "memberof",
+                            "memberindirect"
+                        ],
+                        "hidden_attributes": [
+                            "objectclass",
+                            "aci"
+                        ],
+                        "label": "Privileges",
+                        "methods": [
+                            "add",
+                            "add_member",
+                            "add_permission",
+                            "del",
+                            "find",
+                            "mod",
+                            "remove_member",
+                            "remove_permission",
+                            "show"
+                        ],
+                        "name": "privilege",
+                        "object_class": [
+                            "nestedgroup",
+                            "groupofnames"
+                        ],
+                        "object_class_config": null,
+                        "object_name": "privilege",
+                        "object_name_plural": "privileges",
+                        "parent_object": "",
+                        "primary_key": "cn",
+                        "rdn_attribute": "",
+                        "takes_params": [
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "name",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Privilege name",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Privilege name",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "cn",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": true,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "desc",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Privilege description",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Description",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "description",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            }
+                        ],
+                        "uuid_attribute": ""
+                    },
                     "pwpolicy": {
                         "attribute_members": {},
                         "container_dn": "cn=AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
@@ -2737,7 +3605,7 @@
                         ],
                         "uuid_attribute": ""
                     },
-                    "rolegroup": {
+                    "role": {
                         "attribute_members": {
                             "member": [
                                 "user",
@@ -2745,17 +3613,11 @@
                                 "host",
                                 "hostgroup"
                             ],
-                            "memberindirect": [
-                                "user",
-                                "group",
-                                "host",
-                                "hostgroup"
-                            ],
                             "memberof": [
-                                "taskgroup"
+                                "privilege"
                             ]
                         },
-                        "container_dn": "cn=rolegroups,cn=accounts",
+                        "container_dn": "cn=roles,cn=accounts",
                         "default_attributes": [
                             "cn",
                             "description",
@@ -2771,20 +3633,22 @@
                         "methods": [
                             "add",
                             "add_member",
+                            "add_privilege",
                             "del",
                             "find",
                             "mod",
                             "remove_member",
+                            "remove_privilege",
                             "show"
                         ],
-                        "name": "rolegroup",
+                        "name": "role",
                         "object_class": [
                             "groupofnames",
                             "nestedgroup"
                         ],
                         "object_class_config": null,
-                        "object_name": "rolegroup",
-                        "object_name_plural": "rolegroups",
+                        "object_name": "role",
+                        "object_name_plural": "roles",
                         "parent_object": "",
                         "primary_key": "cn",
                         "rdn_attribute": "",
@@ -2796,12 +3660,12 @@
                                 "cli_name": "name",
                                 "cli_short_name": null,
                                 "default": null,
-                                "doc": "Role-group name",
+                                "doc": "Role name",
                                 "exclude": null,
                                 "flags": [],
                                 "hint": null,
                                 "include": null,
-                                "label": "Role-group name",
+                                "label": "Role name",
                                 "length": null,
                                 "maxlength": null,
                                 "minlength": null,
@@ -3517,112 +4381,12 @@
                         ],
                         "uuid_attribute": "ipauniqueid"
                     },
-                    "taskgroup": {
-                        "attribute_members": {
-                            "member": [
-                                "user",
-                                "group",
-                                "rolegroup"
-                            ],
-                            "memberindirect": [
-                                "user",
-                                "group",
-                                "rolegroup"
-                            ]
-                        },
-                        "container_dn": "cn=taskgroups,cn=accounts",
-                        "default_attributes": [
-                            "cn",
-                            "description",
-                            "member",
-                            "memberof",
-                            "memberindirect"
-                        ],
-                        "hidden_attributes": [
-                            "objectclass",
-                            "aci"
-                        ],
-                        "label": "Task Groups",
-                        "methods": [
-                            "add",
-                            "add_member",
-                            "del",
-                            "find",
-                            "mod",
-                            "remove_member",
-                            "show"
-                        ],
-                        "name": "taskgroup",
-                        "object_class": [
-                            "groupofnames"
-                        ],
-                        "object_class_config": null,
-                        "object_name": "taskgroup",
-                        "object_name_plural": "taskgroups",
-                        "parent_object": "",
-                        "primary_key": "cn",
-                        "rdn_attribute": "",
-                        "takes_params": [
-                            {
-                                "attribute": false,
-                                "autofill": false,
-                                "class": "Str",
-                                "cli_name": "name",
-                                "cli_short_name": null,
-                                "default": null,
-                                "doc": "Task-group name",
-                                "exclude": null,
-                                "flags": [],
-                                "hint": null,
-                                "include": null,
-                                "label": "Task-group name",
-                                "length": null,
-                                "maxlength": null,
-                                "minlength": null,
-                                "multivalue": false,
-                                "name": "cn",
-                                "pattern": null,
-                                "pattern_errmsg": null,
-                                "primary_key": true,
-                                "query": false,
-                                "required": true,
-                                "type": "unicode"
-                            },
-                            {
-                                "attribute": false,
-                                "autofill": false,
-                                "class": "Str",
-                                "cli_name": "desc",
-                                "cli_short_name": null,
-                                "default": null,
-                                "doc": "Task-group description",
-                                "exclude": null,
-                                "flags": [],
-                                "hint": null,
-                                "include": null,
-                                "label": "Description",
-                                "length": null,
-                                "maxlength": null,
-                                "minlength": null,
-                                "multivalue": false,
-                                "name": "description",
-                                "pattern": null,
-                                "pattern_errmsg": null,
-                                "primary_key": false,
-                                "query": false,
-                                "required": true,
-                                "type": "unicode"
-                            }
-                        ],
-                        "uuid_attribute": ""
-                    },
                     "user": {
                         "attribute_members": {
                             "memberof": [
                                 "group",
                                 "netgroup",
-                                "rolegroup",
-                                "taskgroup"
+                                "role"
                             ]
                         },
                         "container_dn": "cn=users,cn=accounts",
@@ -4123,19 +4887,19 @@
                             "Administrator"
                         ],
                         "gidnumber": [
-                            "757995011"
+                            "496082529"
                         ],
                         "homedirectory": [
                             "/home/admin"
                         ],
                         "ipauniqueid": [
-                            "297bbe44-f810-11df-8f59-525400674dcd"
+                            "a752ed4a-fde4-11df-902d-525400674dcd"
                         ],
                         "krblastpwdchange": [
-                            "20101124211850Z"
+                            "20101202072313Z"
                         ],
                         "krbpasswordexpiration": [
-                            "20110222211850Z"
+                            "20110302072313Z"
                         ],
                         "krbprincipalname": [
                             "admin@AYOUNG.BOSTON.DEVEL.REDHAT.COM"
@@ -4146,13 +4910,6 @@
                         "memberof_group": [
                             "admins"
                         ],
-                        "memberof_rolegroup": [
-                            "replicaadmin"
-                        ],
-                        "memberof_taskgroup": [
-                            "managereplica",
-                            "deletereplica"
-                        ],
                         "mepmanagedentry": [
                             "cn=admin,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
                         ],
@@ -4176,7 +4933,7 @@
                             "admin"
                         ],
                         "uidnumber": [
-                            "757995011"
+                            "496082529"
                         ]
                     }
                 ],
@@ -4184,7 +4941,7 @@
                 "truncated": false
             },
             {
-                "count": 67,
+                "count": 68,
                 "error": null,
                 "result": {
                     "basedn": "dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
@@ -4209,16 +4966,17 @@
                     "container_host": "cn=computers,cn=accounts",
                     "container_hostgroup": "cn=hostgroups,cn=accounts",
                     "container_netgroup": "cn=ng,cn=alt",
+                    "container_permission": "cn=permissions,cn=accounts",
                     "container_policies": "cn=policies",
                     "container_policygroups": "cn=policygroups,cn=configs,cn=policies",
                     "container_policylinks": "cn=policylinks,cn=configs,cn=policies",
-                    "container_rolegroup": "cn=rolegroups,cn=accounts",
+                    "container_privilege": "cn=privileges,cn=accounts",
+                    "container_rolegroup": "cn=roles,cn=accounts",
                     "container_roles": "cn=roles,cn=policies",
                     "container_service": "cn=services,cn=accounts",
                     "container_sudocmd": "cn=sudocmds,cn=accounts",
                     "container_sudocmdgroup": "cn=sudocmdgroups,cn=accounts",
                     "container_sudorule": "cn=sudorules",
-                    "container_taskgroup": "cn=taskgroups,cn=accounts",
                     "container_user": "cn=users,cn=accounts",
                     "container_virtual": "cn=virtual operations",
                     "context": "lite",
@@ -4255,8 +5013,8 @@
                     "webui_prod": true,
                     "xmlrpc_uri": "http://localhost:8888/ipa/xml"
                 },
-                "summary": "67 variables",
-                "total": 67
+                "summary": "68 variables",
+                "total": 68
             }
         ]
     }
diff --git a/install/static/webui.js b/install/static/webui.js
index 93ad899e8..26f600981 100644
--- a/install/static/webui.js
+++ b/install/static/webui.js
@@ -33,7 +33,7 @@ var admin_tab_set = [
         {name:'service', label:'Services', setup: ipa_entity_setup}
     ]},
     {name:'policy', children:[
-        {name:'dns', setup: ipa_entity_setup},
+        {name:'dnszone', setup: ipa_entity_setup},
         {name:'hbac', setup: ipa_entity_setup, children:[
             {name:'hbacsvc', setup: ipa_entity_setup},
             {name:'hbacsvcgroup', setup: ipa_entity_setup}