PAC Type options for services in Web UI

Following options were added to Web UI
    * PAC Type in service
    * PAC Type in configuration

Testing metadata for objects and commands were regenerated.

https://fedorahosted.org/freeipa/ticket/2958

6 files changed, 840 insertions, 5 deletions

diff --git a/install/ui/serverconfig.js b/install/ui/serverconfig.js
index 3e61f6509..950b98982 100644
--- a/install/ui/serverconfig.js
+++ b/install/ui/serverconfig.js
@@ -95,6 +95,17 @@ IPA.config.entity = function(spec) {
                         'ipaselinuxusermaporder',
                         'ipaselinuxusermapdefault'
                     ]
+                },
+                {
+                    name: 'service',
+                    label: IPA.messages.objects.config.service,
+                    fields: [
+                        {
+                            name: 'ipakrbauthzdata',
+                            type: 'checkboxes',
+                            options: IPA.create_options(['MS-PAC', 'PAD'])
+                        }
+                    ]
                 }
             ],
             needs_update: true
diff --git a/install/ui/service.js b/install/ui/service.js
index feb5ade87..be3d90478 100644
--- a/install/ui/service.js
+++ b/install/ui/service.js
@@ -53,6 +53,11 @@ IPA.service.entity = function(spec) {
                             name: 'host',
                             label: IPA.messages.objects.service.host,
                             read_only: true
+                        },
+                        {
+                            name: 'ipakrbauthzdata',
+                            type: 'checkboxes',
+                            options: IPA.create_options(['MS-PAC', 'PAD'])
                         }
                     ]
                 },
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 2cc1130f0..4325a5552 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -211,6 +211,7 @@
                             "group": "Group Options",
                             "search": "Search Options",
                             "selinux": "SELinux Options",
+                            "service": "Service Options",
                             "user": "User Options"
                         },
                         "delegation": {},
diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index 3a2d2612d..0f4edb891 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -1825,7 +1825,7 @@
                 "takes_options": [
                     {
                         "class": "Str",
-                        "doc": "Service principal for this certificate (e.g. HTTP/dev.example.com)",
+                        "doc": "Service principal for this certificate (e.g. HTTP/test.example.com)",
                         "flags": [],
                         "label": "Principal",
                         "name": "principal",
@@ -2129,6 +2129,20 @@
                         "type": "unicode"
                     },
                     {
+                        "attribute": true,
+                        "class": "StrEnum",
+                        "doc": "Default types of PAC for new services",
+                        "flags": [],
+                        "label": "PAC type",
+                        "multivalue": true,
+                        "name": "ipakrbauthzdata",
+                        "type": "unicode",
+                        "values": [
+                            "MS-PAC",
+                            "PAD"
+                        ]
+                    },
+                    {
                         "name": "setattr"
                     },
                     {
@@ -3353,6 +3367,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_lat_sec",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 3,
                         "type": "Decimal"
@@ -3417,6 +3436,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_lon_sec",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 3,
                         "type": "Decimal"
@@ -3454,6 +3478,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_altitude",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -3472,6 +3501,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_size",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -3490,6 +3524,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_h_precision",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -3508,6 +3547,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_v_precision",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -6193,6 +6237,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_lat_sec",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 3,
                         "type": "Decimal"
@@ -6257,6 +6306,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_lon_sec",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 3,
                         "type": "Decimal"
@@ -6294,6 +6348,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_altitude",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -6312,6 +6371,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_size",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -6330,6 +6394,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_h_precision",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -6348,6 +6417,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_v_precision",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -7554,6 +7628,10 @@
                     }
                 ]
             },
+            "dnszone_add_permission": {
+                "takes_args": [],
+                "takes_options": []
+            },
             "dnszone_del": {
                 "takes_args": [],
                 "takes_options": [
@@ -8089,6 +8167,10 @@
                     }
                 ]
             },
+            "dnszone_remove_permission": {
+                "takes_args": [],
+                "takes_options": []
+            },
             "dnszone_show": {
                 "takes_args": [],
                 "takes_options": [
@@ -8385,6 +8467,15 @@
                         "type": "bool"
                     },
                     {
+                        "class": "Flag",
+                        "doc": "Allow adding external non-IPA members from trusted domains",
+                        "flags": [],
+                        "label": "<external>",
+                        "name": "external",
+                        "required": true,
+                        "type": "bool"
+                    },
+                    {
                         "name": "all"
                     },
                     {
@@ -8399,6 +8490,20 @@
                 "takes_args": [],
                 "takes_options": [
                     {
+                        "class": "Str",
+                        "doc": "comma-separated SIDs of members of a trusted domain",
+                        "flags": [
+                            "no_update",
+                            "no_create",
+                            "no_search"
+                        ],
+                        "label": "External member",
+                        "multivalue": true,
+                        "name": "ipaexternalmember",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
                         "name": "all"
                     },
                     {
@@ -8732,6 +8837,15 @@
                         "type": "bool"
                     },
                     {
+                        "class": "Flag",
+                        "doc": "change to support external non-IPA members from trusted domains",
+                        "flags": [],
+                        "label": "<external>",
+                        "name": "external",
+                        "required": true,
+                        "type": "bool"
+                    },
+                    {
                         "name": "all"
                     },
                     {
@@ -8759,6 +8873,20 @@
                 "takes_args": [],
                 "takes_options": [
                     {
+                        "class": "Str",
+                        "doc": "comma-separated SIDs of members of a trusted domain",
+                        "flags": [
+                            "no_update",
+                            "no_create",
+                            "no_search"
+                        ],
+                        "label": "External member",
+                        "multivalue": true,
+                        "name": "ipaexternalmember",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
                         "name": "all"
                     },
                     {
@@ -12291,6 +12419,31 @@
                     }
                 ]
             },
+            "permission_add_noaci": {
+                "takes_args": [],
+                "takes_options": [
+                    {
+                        "class": "StrEnum",
+                        "doc": "Permission type",
+                        "flags": [],
+                        "label": "Permission type",
+                        "name": "permissiontype",
+                        "type": "unicode",
+                        "values": [
+                            "SYSTEM"
+                        ]
+                    },
+                    {
+                        "name": "all"
+                    },
+                    {
+                        "name": "raw"
+                    },
+                    {
+                        "name": "version"
+                    }
+                ]
+            },
             "permission_del": {
                 "takes_args": [],
                 "takes_options": [
@@ -12302,6 +12455,18 @@
                         "name": "continue",
                         "required": true,
                         "type": "bool"
+                    },
+                    {
+                        "class": "Flag",
+                        "doc": "force delete of SYSTEM permissions",
+                        "flags": [
+                            "no_option",
+                            "no_output"
+                        ],
+                        "label": "Force",
+                        "name": "force",
+                        "required": true,
+                        "type": "bool"
                     }
                 ]
             },
@@ -13387,6 +13552,364 @@
                     }
                 ]
             },
+            "range_add": {
+                "takes_args": [],
+                "takes_options": [
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First Posix ID of the range",
+                        "flags": [],
+                        "label": "First Posix ID of the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaseid",
+                        "required": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "Number of IDs in the range",
+                        "flags": [],
+                        "label": "Number of IDs in the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipaidrangesize",
+                        "required": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First RID of the corresponding RID range",
+                        "flags": [],
+                        "label": "First RID of the corresponding RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaserid",
+                        "required": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First RID of the secondary RID range",
+                        "flags": [],
+                        "label": "First RID of the secondary RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipasecondarybaserid",
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Domain SID of the trusted domain",
+                        "flags": [],
+                        "label": "Domain SID of the trusted domain",
+                        "name": "ipanttrusteddomainsid",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Range type",
+                        "flags": [
+                            "no_option"
+                        ],
+                        "label": "Range type",
+                        "name": "iparangetype",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "name": "setattr"
+                    },
+                    {
+                        "name": "addattr"
+                    },
+                    {
+                        "name": "all"
+                    },
+                    {
+                        "name": "raw"
+                    },
+                    {
+                        "name": "version"
+                    }
+                ]
+            },
+            "range_del": {
+                "takes_args": [],
+                "takes_options": [
+                    {
+                        "class": "Flag",
+                        "doc": "Continuous mode: Don't stop on errors.",
+                        "flags": [],
+                        "label": "<continue>",
+                        "name": "continue",
+                        "required": true,
+                        "type": "bool"
+                    }
+                ]
+            },
+            "range_find": {
+                "takes_args": [],
+                "takes_options": [
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Range name",
+                        "flags": [],
+                        "label": "Range name",
+                        "name": "cn",
+                        "noextrawhitespace": true,
+                        "primary_key": true,
+                        "query": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First Posix ID of the range",
+                        "flags": [],
+                        "label": "First Posix ID of the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaseid",
+                        "query": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "Number of IDs in the range",
+                        "flags": [],
+                        "label": "Number of IDs in the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipaidrangesize",
+                        "query": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First RID of the corresponding RID range",
+                        "flags": [],
+                        "label": "First RID of the corresponding RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaserid",
+                        "query": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First RID of the secondary RID range",
+                        "flags": [],
+                        "label": "First RID of the secondary RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipasecondarybaserid",
+                        "query": true,
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Domain SID of the trusted domain",
+                        "flags": [],
+                        "label": "Domain SID of the trusted domain",
+                        "name": "ipanttrusteddomainsid",
+                        "noextrawhitespace": true,
+                        "query": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Range type",
+                        "flags": [
+                            "no_option"
+                        ],
+                        "label": "Range type",
+                        "name": "iparangetype",
+                        "noextrawhitespace": true,
+                        "query": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "class": "Int",
+                        "doc": "Time limit of search in seconds",
+                        "flags": [
+                            "no_display"
+                        ],
+                        "label": "Time Limit",
+                        "maxvalue": 2147483647,
+                        "name": "timelimit",
+                        "type": "int"
+                    },
+                    {
+                        "class": "Int",
+                        "doc": "Maximum number of entries returned",
+                        "flags": [
+                            "no_display"
+                        ],
+                        "label": "Size Limit",
+                        "maxvalue": 2147483647,
+                        "name": "sizelimit",
+                        "type": "int"
+                    },
+                    {
+                        "name": "all"
+                    },
+                    {
+                        "name": "raw"
+                    },
+                    {
+                        "name": "version"
+                    },
+                    {
+                        "class": "Flag",
+                        "doc": "Results should contain primary key attribute only (\"name\")",
+                        "flags": [],
+                        "label": "Primary key only",
+                        "name": "pkey_only",
+                        "type": "bool"
+                    }
+                ]
+            },
+            "range_mod": {
+                "takes_args": [],
+                "takes_options": [
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First Posix ID of the range",
+                        "flags": [
+                            "nonempty"
+                        ],
+                        "label": "First Posix ID of the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaseid",
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "Number of IDs in the range",
+                        "flags": [
+                            "nonempty"
+                        ],
+                        "label": "Number of IDs in the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipaidrangesize",
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First RID of the corresponding RID range",
+                        "flags": [
+                            "nonempty"
+                        ],
+                        "label": "First RID of the corresponding RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaserid",
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Int",
+                        "doc": "First RID of the secondary RID range",
+                        "flags": [],
+                        "label": "First RID of the secondary RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipasecondarybaserid",
+                        "type": "int"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Domain SID of the trusted domain",
+                        "flags": [],
+                        "label": "Domain SID of the trusted domain",
+                        "name": "ipanttrusteddomainsid",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "doc": "Range type",
+                        "flags": [
+                            "no_option"
+                        ],
+                        "label": "Range type",
+                        "name": "iparangetype",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "name": "setattr"
+                    },
+                    {
+                        "name": "addattr"
+                    },
+                    {
+                        "name": "delattr"
+                    },
+                    {
+                        "class": "Flag",
+                        "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                        "flags": [],
+                        "label": "Rights",
+                        "name": "rights",
+                        "required": true,
+                        "type": "bool"
+                    },
+                    {
+                        "name": "all"
+                    },
+                    {
+                        "name": "raw"
+                    },
+                    {
+                        "name": "version"
+                    }
+                ]
+            },
+            "range_show": {
+                "takes_args": [],
+                "takes_options": [
+                    {
+                        "class": "Flag",
+                        "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                        "flags": [],
+                        "label": "Rights",
+                        "name": "rights",
+                        "required": true,
+                        "type": "bool"
+                    },
+                    {
+                        "name": "all"
+                    },
+                    {
+                        "name": "raw"
+                    },
+                    {
+                        "name": "version"
+                    }
+                ]
+            },
             "role_add": {
                 "takes_args": [],
                 "takes_options": [
@@ -14370,6 +14893,20 @@
                         "type": "str"
                     },
                     {
+                        "attribute": true,
+                        "class": "StrEnum",
+                        "doc": "Types of PAC this service supports",
+                        "flags": [],
+                        "label": "PAC type",
+                        "multivalue": true,
+                        "name": "ipakrbauthzdata",
+                        "type": "unicode",
+                        "values": [
+                            "MS-PAC",
+                            "PAD"
+                        ]
+                    },
+                    {
                         "class": "Flag",
                         "doc": "force principal name even if not in DNS",
                         "flags": [],
@@ -14447,6 +14984,21 @@
                         "type": "unicode"
                     },
                     {
+                        "attribute": true,
+                        "class": "StrEnum",
+                        "doc": "Types of PAC this service supports",
+                        "flags": [],
+                        "label": "PAC type",
+                        "multivalue": true,
+                        "name": "ipakrbauthzdata",
+                        "query": true,
+                        "type": "unicode",
+                        "values": [
+                            "MS-PAC",
+                            "PAD"
+                        ]
+                    },
+                    {
                         "class": "Int",
                         "doc": "Time limit of search in seconds",
                         "flags": [
@@ -14522,6 +15074,20 @@
                         "type": "str"
                     },
                     {
+                        "attribute": true,
+                        "class": "StrEnum",
+                        "doc": "Types of PAC this service supports",
+                        "flags": [],
+                        "label": "PAC type",
+                        "multivalue": true,
+                        "name": "ipakrbauthzdata",
+                        "type": "unicode",
+                        "values": [
+                            "MS-PAC",
+                            "PAD"
+                        ]
+                    },
+                    {
                         "name": "setattr"
                     },
                     {
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index 25db686ce..d63be85e6 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -383,7 +383,8 @@
                     "ipapwdexpadvnotify",
                     "ipaselinuxusermaporder",
                     "ipaselinuxusermapdefault",
-                    "ipaconfigstring"
+                    "ipaconfigstring",
+                    "ipakrbauthzdata"
                 ],
                 "hidden_attributes": [
                     "objectclass",
@@ -604,6 +605,19 @@
                         "noextrawhitespace": true,
                         "required": true,
                         "type": "unicode"
+                    },
+                    {
+                        "class": "StrEnum",
+                        "doc": "Default types of PAC for new services",
+                        "flags": [],
+                        "label": "PAC type",
+                        "multivalue": true,
+                        "name": "ipakrbauthzdata",
+                        "type": "unicode",
+                        "values": [
+                            "MS-PAC",
+                            "PAD"
+                        ]
                     }
                 ],
                 "uuid_attribute": ""
@@ -715,7 +729,23 @@
                     "ditcontentrules",
                     "ditredirect",
                     "ditstructurerules",
+                    "dnafilter",
+                    "dnahostname",
+                    "dnainterval",
+                    "dnamagicregen",
+                    "dnamaxvalue",
                     "dnamerecord",
+                    "dnanextrange",
+                    "dnanextvalue",
+                    "dnaportnum",
+                    "dnaprefix",
+                    "dnarangerequesttimeout",
+                    "dnaremainingvalues",
+                    "dnascope",
+                    "dnasecureportnum",
+                    "dnasharedcfgdn",
+                    "dnathreshold",
+                    "dnatype",
                     "dncomp",
                     "dnqualifier",
                     "dnsclass",
@@ -803,9 +833,13 @@
                     "info",
                     "initials",
                     "installationtimestamp",
+                    "internalcreatorsname",
+                    "internalmodifiersname",
                     "internationalisdnnumber",
                     "ipaallowedtarget",
                     "ipaallowtoimpersonate",
+                    "ipabaseid",
+                    "ipabaserid",
                     "ipacertificatesubjectbase",
                     "ipaclientversion",
                     "ipaconfigstring",
@@ -819,6 +853,8 @@
                     "ipagroupobjectclasses",
                     "ipagroupsearchfields",
                     "ipahomesrootdir",
+                    "ipaidrangesize",
+                    "ipakrbauthzdata",
                     "ipakrbprincipalalias",
                     "ipamaxusernamelength",
                     "ipamigrationenabled",
@@ -845,6 +881,7 @@
                     "ipapwdexpadvnotify",
                     "ipasearchrecordslimit",
                     "ipasearchtimelimit",
+                    "ipasecondarybaserid",
                     "ipaselinuxuser",
                     "ipaselinuxusermapdefault",
                     "ipaselinuxusermaporder",
@@ -1063,6 +1100,7 @@
                     "nsds5replicachangecount",
                     "nsds5replicachangessentsincestartup",
                     "nsds5replicacredentials",
+                    "nsds5replicaenabled",
                     "nsds5replicahost",
                     "nsds5replicaid",
                     "nsds5replicalastinitend",
@@ -1078,6 +1116,7 @@
                     "nsds5replicareferral",
                     "nsds5replicaroot",
                     "nsds5replicasessionpausetime",
+                    "nsds5replicastripattrs",
                     "nsds5replicatedattributelist",
                     "nsds5replicatedattributelisttotal",
                     "nsds5replicatimeout",
@@ -1187,6 +1226,7 @@
                     "nssystemindex",
                     "nstasklabel",
                     "nstimelimit",
+                    "nstls1",
                     "nsuniqueattribute",
                     "nsuniqueid",
                     "nsuseridformat",
@@ -1258,6 +1298,7 @@
                     "pager",
                     "pamexcludesuffix",
                     "pamfallback",
+                    "pamfilter",
                     "pamidattr",
                     "pamidmapmethod",
                     "pamincludesuffix",
@@ -1347,6 +1388,7 @@
                     "profilettl",
                     "ptrrecord",
                     "pwdpolicysubentry",
+                    "pwdupdatetime",
                     "ref",
                     "registeredaddress",
                     "replicaabandonedchanges",
@@ -1377,7 +1419,9 @@
                     "sambabadpasswordcount",
                     "sambabadpasswordtime",
                     "sambabooloption",
+                    "sambacleartextpassword",
                     "sambadomainname",
+                    "sambaflatname",
                     "sambaforcelogoff",
                     "sambagrouptype",
                     "sambahomedrive",
@@ -1403,6 +1447,7 @@
                     "sambantpassword",
                     "sambaoptionname",
                     "sambapasswordhistory",
+                    "sambapreviouscleartextpassword",
                     "sambaprimarygroupsid",
                     "sambaprofilepath",
                     "sambapwdcanchange",
@@ -1410,12 +1455,22 @@
                     "sambapwdlastset",
                     "sambapwdmustchange",
                     "sambarefusemachinepwdchange",
+                    "sambasecurityidentifier",
                     "sambasharename",
                     "sambasid",
                     "sambasidlist",
                     "sambastringlistoption",
                     "sambastringoption",
+                    "sambasupportedencryptiontypes",
+                    "sambatrustattributes",
+                    "sambatrustauthincoming",
+                    "sambatrustauthoutgoing",
+                    "sambatrustdirection",
                     "sambatrustflags",
+                    "sambatrustforesttrustinfo",
+                    "sambatrustpartner",
+                    "sambatrustposixoffset",
+                    "sambatrusttype",
                     "sambauserworkstations",
                     "searchguide",
                     "searchtimelimit",
@@ -2547,6 +2602,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_lat_sec",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 3,
                         "type": "Decimal"
@@ -2611,6 +2671,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_lon_sec",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 3,
                         "type": "Decimal"
@@ -2648,6 +2713,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_altitude",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -2666,6 +2736,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_size",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -2684,6 +2759,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_h_precision",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -2702,6 +2782,11 @@
                             "__base64__": ""
                         },
                         "name": "loc_part_v_precision",
+                        "numberclass": [
+                            "-Normal",
+                            "+Zero",
+                            "+Normal"
+                        ],
                         "option_group": "LOC Record",
                         "precision": 2,
                         "type": "Decimal"
@@ -3616,6 +3701,7 @@
                     "keyrecord",
                     "kxrecord",
                     "locrecord",
+                    "managedby",
                     "mdrecord",
                     "minforecord",
                     "mxrecord",
@@ -3691,11 +3777,13 @@
                 "label_singular": "DNS Zone",
                 "methods": [
                     "add",
+                    "add_permission",
                     "del",
                     "disable",
                     "enable",
                     "find",
                     "mod",
+                    "remove_permission",
                     "show"
                 ],
                 "name": "dnszone",
@@ -4004,6 +4092,7 @@
                     "cn",
                     "description",
                     "gidnumber",
+                    "ipaexternalmember",
                     "ipauniqueid",
                     "member",
                     "memberof",
@@ -4049,7 +4138,8 @@
                     "member",
                     "memberof",
                     "memberindirect",
-                    "memberofindirect"
+                    "memberofindirect",
+                    "ipaexternalmember"
                 ],
                 "hidden_attributes": [
                     "objectclass",
@@ -4656,6 +4746,7 @@
                     "enrolledby",
                     "fqdn",
                     "ipaclientversion",
+                    "ipakrbauthzdata",
                     "ipauniqueid",
                     "l",
                     "managedby",
@@ -5343,6 +5434,7 @@
                 "methods": [
                     "add",
                     "add_member",
+                    "add_noaci",
                     "del",
                     "find",
                     "mod",
@@ -5765,6 +5857,150 @@
                 ],
                 "uuid_attribute": ""
             },
+            "range": {
+                "aciattrs": [
+                    "cn",
+                    "ipabaseid",
+                    "ipabaserid",
+                    "ipaidrangesize",
+                    "ipanttrusteddomainsid",
+                    "ipasecondarybaserid"
+                ],
+                "attribute_members": {},
+                "bindable": false,
+                "container_dn": "cn=ranges,cn=etc",
+                "default_attributes": [
+                    "cn",
+                    "ipabaseid",
+                    "ipaidrangesize",
+                    "ipabaserid",
+                    "ipasecondarybaserid",
+                    "ipanttrusteddomainsid",
+                    "iparangetype"
+                ],
+                "hidden_attributes": [
+                    "objectclass",
+                    "aci"
+                ],
+                "label": "Ranges",
+                "label_singular": "Range",
+                "methods": [
+                    "add",
+                    "del",
+                    "find",
+                    "mod",
+                    "show"
+                ],
+                "name": "range",
+                "object_class": [
+                    "ipaIDrange"
+                ],
+                "object_class_config": null,
+                "object_name": "range",
+                "object_name_plural": "ranges",
+                "parent_object": "",
+                "primary_key": "cn",
+                "rdn_attribute": "",
+                "relationships": {
+                    "member": [
+                        "Member",
+                        "",
+                        "no_"
+                    ],
+                    "memberindirect": [
+                        "Indirect Member",
+                        null,
+                        "no_indirect_"
+                    ],
+                    "memberof": [
+                        "Member Of",
+                        "in_",
+                        "not_in_"
+                    ],
+                    "memberofindirect": [
+                        "Indirect Member Of",
+                        null,
+                        "not_in_indirect_"
+                    ]
+                },
+                "takes_params": [
+                    {
+                        "class": "Str",
+                        "doc": "Range name",
+                        "flags": [],
+                        "label": "Range name",
+                        "name": "cn",
+                        "noextrawhitespace": true,
+                        "primary_key": true,
+                        "required": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "class": "Int",
+                        "doc": "First Posix ID of the range",
+                        "flags": [],
+                        "label": "First Posix ID of the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaseid",
+                        "required": true,
+                        "type": "int"
+                    },
+                    {
+                        "class": "Int",
+                        "doc": "Number of IDs in the range",
+                        "flags": [],
+                        "label": "Number of IDs in the range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipaidrangesize",
+                        "required": true,
+                        "type": "int"
+                    },
+                    {
+                        "class": "Int",
+                        "doc": "First RID of the corresponding RID range",
+                        "flags": [],
+                        "label": "First RID of the corresponding RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipabaserid",
+                        "required": true,
+                        "type": "int"
+                    },
+                    {
+                        "class": "Int",
+                        "doc": "First RID of the secondary RID range",
+                        "flags": [],
+                        "label": "First RID of the secondary RID range",
+                        "maxvalue": 2147483647,
+                        "minvalue": -2147483648,
+                        "name": "ipasecondarybaserid",
+                        "type": "int"
+                    },
+                    {
+                        "class": "Str",
+                        "doc": "Domain SID of the trusted domain",
+                        "flags": [],
+                        "label": "Domain SID of the trusted domain",
+                        "name": "ipanttrusteddomainsid",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
+                    {
+                        "class": "Str",
+                        "doc": "Range type",
+                        "flags": [
+                            "no_option"
+                        ],
+                        "label": "Range type",
+                        "name": "iparangetype",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    }
+                ],
+                "uuid_attribute": ""
+            },
             "role": {
                 "aciattrs": [
                     "businesscategory",
@@ -6146,6 +6382,7 @@
             },
             "service": {
                 "aciattrs": [
+                    "ipakrbauthzdata",
                     "ipakrbprincipalalias",
                     "ipauniqueid",
                     "krbcanonicalname",
@@ -6184,7 +6421,8 @@
                 "default_attributes": [
                     "krbprincipalname",
                     "usercertificate",
-                    "managedby"
+                    "managedby",
+                    "ipakrbauthzdata"
                 ],
                 "hidden_attributes": [
                     "objectclass",
@@ -6246,6 +6484,19 @@
                         "label": "Certificate",
                         "name": "usercertificate",
                         "type": "str"
+                    },
+                    {
+                        "class": "StrEnum",
+                        "doc": "Types of PAC this service supports",
+                        "flags": [],
+                        "label": "PAC type",
+                        "multivalue": true,
+                        "name": "ipakrbauthzdata",
+                        "type": "unicode",
+                        "values": [
+                            "MS-PAC",
+                            "PAD"
+                        ]
                     }
                 ],
                 "uuid_attribute": "ipauniqueid"
@@ -6932,7 +7183,7 @@
                 "label": "Trusts",
                 "label_singular": "Trust",
                 "methods": [
-                    "add_ad",
+                    "add",
                     "del",
                     "find",
                     "mod",
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index fc7f9dddf..08d7a255f 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -347,6 +347,7 @@ class i18n_messages(Command):
                 "group": _("Group Options"),
                 "search": _("Search Options"),
                 "selinux": _("SELinux Options"),
+                "service": _("Service Options"),
                 "user": _("User Options"),
             },
             "delegation": {