diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2013-04-26 17:21:45 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2013-05-06 16:22:30 +0200 |
| commit | 242a090807a16f10be07c136db0416ed0107ce6a (patch) | |
| tree | 7c19fbc672885be2f25ac0aaec8d9dc8c80d584c | |
| parent | 853cdbbfd301d1da41b6f2185f24c5ff6deb48b3 (diff) | |
| download | freeipa-242a090807a16f10be07c136db0416ed0107ce6a.tar.gz freeipa-242a090807a16f10be07c136db0416ed0107ce6a.tar.xz freeipa-242a090807a16f10be07c136db0416ed0107ce6a.zip | |
Fix trustconfig specification
https://fedorahosted.org/freeipa/ticket/3235
| -rw-r--r-- | install/ui/src/freeipa/trust.js | 3 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 2 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init_objects.json | 50 | ||||
| -rw-r--r-- | install/ui/test/data/trust_show.json | 67 |
4 files changed, 118 insertions, 4 deletions
diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js index 91ef819ae..5f3458d29 100644 --- a/install/ui/src/freeipa/trust.js +++ b/install/ui/src/freeipa/trust.js @@ -206,7 +206,8 @@ IPA.trust.adder_dialog = function(spec) { var make_trustconfig_spec = function() { return { - name: 'trust', + name: 'trustconfig', + defines_key: false, enable_test: function() { return IPA.trust_enabled; }, diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 98e622cf0..d025f6958 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -477,7 +477,7 @@ "trust": { "account": "Account", "admin_account": "Administrative account", - "name": "SID blacklists", + "blacklists": "SID blacklists", "details": "Trust Settings", "domain": "Domain", "establish_using": "Establish using", diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json index b06c28f9c..12f7ebfd6 100644 --- a/install/ui/test/data/ipa_init_objects.json +++ b/install/ui/test/data/ipa_init_objects.json @@ -7324,6 +7324,56 @@ "primary_key": true, "required": true, "type": "unicode" + }, + { + "class": "Str", + "doc": "Domain NetBIOS name", + "flags": [ + "no_update", + "no_create" + ], + "label": "Domain NetBIOS name", + "name": "ipantflatname", + "noextrawhitespace": true, + "required": true, + "type": "unicode" + }, + { + "class": "Str", + "doc": "Domain Security Identifier", + "flags": [ + "no_update", + "no_create" + ], + "label": "Domain Security Identifier", + "name": "ipanttrusteddomainsid", + "noextrawhitespace": true, + "required": true, + "type": "unicode" + }, + { + "class": "Str", + "doc": "SID blacklist incoming", + "flags": [ + "no_create" + ], + "label": "SID blacklist incoming", + "multivalue": true, + "name": "ipantsidblacklistincoming", + "noextrawhitespace": true, + "type": "unicode" + }, + { + "class": "Str", + "doc": "SID blacklist outgoing", + "flags": [ + "no_create" + ], + "label": "SID blacklist outgoing", + "multivalue": true, + "name": "ipantsidblacklistoutgoing", + "noextrawhitespace": true, + "type": "unicode" } ], "uuid_attribute": "" diff --git a/install/ui/test/data/trust_show.json b/install/ui/test/data/trust_show.json index fa5ce3a0d..efae14a03 100644 --- a/install/ui/test/data/trust_show.json +++ b/install/ui/test/data/trust_show.json @@ -6,7 +6,11 @@ "attributelevelrights": { "aci": "rscwo", "cn": "rscwo", + "gidnumber": "rscwo", "ipantflatname": "rscwo", + "ipantsecurityidentifier": "rscwo", + "ipantsidblacklistincoming": "rscwo", + "ipantsidblacklistoutgoing": "rscwo", "ipantsupportedencryptiontypes": "rscwo", "ipanttrustattributes": "rscwo", "ipanttrustauthincoming": "rscwo", @@ -17,7 +21,9 @@ "ipanttrustpartner": "rscwo", "ipanttrustposixoffset": "rscwo", "ipanttrusttype": "rscwo", - "nsaccountlock": "rscwo" + "nsaccountlock": "rscwo", + "objectclass": "rscwo", + "uidnumber": "rscwo" }, "cn": [ "ad.test" @@ -26,6 +32,58 @@ "ipantflatname": [ "AD" ], + "ipantsidblacklistincoming": [ + "S-1-0", + "S-1-1", + "S-1-2", + "S-1-3", + "S-1-5-1", + "S-1-5-2", + "S-1-5-3", + "S-1-5-4", + "S-1-5-5", + "S-1-5-6", + "S-1-5-7", + "S-1-5-8", + "S-1-5-9", + "S-1-5-10", + "S-1-5-11", + "S-1-5-12", + "S-1-5-13", + "S-1-5-14", + "S-1-5-15", + "S-1-5-16", + "S-1-5-17", + "S-1-5-18", + "S-1-5-19", + "S-1-5-20" + ], + "ipantsidblacklistoutgoing": [ + "S-1-0", + "S-1-1", + "S-1-2", + "S-1-3", + "S-1-5-1", + "S-1-5-2", + "S-1-5-3", + "S-1-5-4", + "S-1-5-5", + "S-1-5-6", + "S-1-5-7", + "S-1-5-8", + "S-1-5-9", + "S-1-5-10", + "S-1-5-11", + "S-1-5-12", + "S-1-5-13", + "S-1-5-14", + "S-1-5-15", + "S-1-5-16", + "S-1-5-17", + "S-1-5-18", + "S-1-5-19", + "S-1-5-20" + ], "ipanttrustattributes": [ "136" ], @@ -52,13 +110,18 @@ "2" ], "objectclass": [ - "ipaNTTrustedDomain" + "ipaNTTrustedDomain", + "ipaIDobject", + "top" ], "trustdirection": [ "Two-way trust" ], "trusttype": [ "Active Directory domain" + ], + "uidnumber": [ + "945800003" ] }, "summary": null, |