summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--API.txt9
-rw-r--r--VERSION4
-rw-r--r--install/ui/test/data/ipa_init_commands.json43
-rw-r--r--install/ui/test/data/ipa_init_objects.json13
-rw-r--r--ipaserver/plugins/trust.py4
5 files changed, 5 insertions, 68 deletions
diff --git a/API.txt b/API.txt
index d5fbc2750..4247dd77c 100644
--- a/API.txt
+++ b/API.txt
@@ -5323,14 +5323,13 @@ output: Entry('result')
output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
output: PrimaryKey('value')
command: trustdomain_add
-args: 2,9,3
+args: 2,8,3
arg: Str('trustcn', cli_name='trust')
arg: Str('cn', cli_name='domain')
option: Str('addattr*', cli_name='addattr')
option: Flag('all', autofill=True, cli_name='all', default=False)
option: Str('ipantflatname?', cli_name='flat_name')
option: Str('ipanttrusteddomainsid?', cli_name='sid')
-option: Str('ipanttrustpartner?')
option: Flag('raw', autofill=True, cli_name='raw', default=False)
option: Str('setattr*', cli_name='setattr')
option: StrEnum('trust_type', autofill=True, cli_name='type', default=u'ad', values=[u'ad'])
@@ -5364,14 +5363,13 @@ output: Output('result', type=[<type 'bool'>])
output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
output: PrimaryKey('value')
command: trustdomain_find
-args: 2,10,4
+args: 2,9,4
arg: Str('trustcn', cli_name='trust')
arg: Str('criteria?')
option: Flag('all', autofill=True, cli_name='all', default=False)
option: Str('cn?', autofill=False, cli_name='domain')
option: Str('ipantflatname?', autofill=False, cli_name='flat_name')
option: Str('ipanttrusteddomainsid?', autofill=False, cli_name='sid')
-option: Str('ipanttrustpartner?', autofill=False)
option: Flag('pkey_only?', autofill=True, default=False)
option: Flag('raw', autofill=True, cli_name='raw', default=False)
option: Int('sizelimit?', autofill=False)
@@ -5382,7 +5380,7 @@ output: ListOfEntries('result')
output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
output: Output('truncated', type=[<type 'bool'>])
command: trustdomain_mod
-args: 2,11,3
+args: 2,10,3
arg: Str('trustcn', cli_name='trust')
arg: Str('cn', cli_name='domain')
option: Str('addattr*', cli_name='addattr')
@@ -5390,7 +5388,6 @@ option: Flag('all', autofill=True, cli_name='all', default=False)
option: Str('delattr*', cli_name='delattr')
option: Str('ipantflatname?', autofill=False, cli_name='flat_name')
option: Str('ipanttrusteddomainsid?', autofill=False, cli_name='sid')
-option: Str('ipanttrustpartner?', autofill=False)
option: Flag('raw', autofill=True, cli_name='raw', default=False)
option: Flag('rights', autofill=True, default=False)
option: Str('setattr*', cli_name='setattr')
diff --git a/VERSION b/VERSION
index 4ada7467a..8945ae548 100644
--- a/VERSION
+++ b/VERSION
@@ -90,5 +90,5 @@ IPA_DATA_VERSION=20100614120000
# #
########################################################
IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=176
-# Last change: mbasti - location-show: list servers in the location
+IPA_API_VERSION_MINOR=177
+# Last change: abbra - adtrust: remove nttrustpartner parameter
diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index c7f717c35..b5c482eac 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -22023,20 +22023,6 @@
"type": "unicode"
},
{
- "attribute": true,
- "class": "Str",
- "deprecated_cli_aliases": [],
- "doc": "Trusted domain partner",
- "flags": [
- "no_display",
- "no_option"
- ],
- "label": "Trusted domain partner",
- "name": "ipanttrustpartner",
- "noextrawhitespace": true,
- "type": "unicode"
- },
- {
"name": "setattr"
},
{
@@ -22142,21 +22128,6 @@
"type": "unicode"
},
{
- "attribute": true,
- "class": "Str",
- "deprecated_cli_aliases": [],
- "doc": "Trusted domain partner",
- "flags": [
- "no_display",
- "no_option"
- ],
- "label": "Trusted domain partner",
- "name": "ipanttrustpartner",
- "noextrawhitespace": true,
- "query": true,
- "type": "unicode"
- },
- {
"class": "Int",
"deprecated_cli_aliases": [],
"doc": "Time limit of search in seconds",
@@ -22228,20 +22199,6 @@
"type": "unicode"
},
{
- "attribute": true,
- "class": "Str",
- "deprecated_cli_aliases": [],
- "doc": "Trusted domain partner",
- "flags": [
- "no_display",
- "no_option"
- ],
- "label": "Trusted domain partner",
- "name": "ipanttrustpartner",
- "noextrawhitespace": true,
- "type": "unicode"
- },
- {
"name": "setattr"
},
{
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index ca98a1a22..d8dfba27f 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -8527,19 +8527,6 @@
"noextrawhitespace": true,
"type": "unicode"
},
- {
- "class": "Str",
- "deprecated_cli_aliases": [],
- "doc": "Trusted domain partner",
- "flags": [
- "no_display",
- "no_option"
- ],
- "label": "Trusted domain partner",
- "name": "ipanttrustpartner",
- "noextrawhitespace": true,
- "type": "unicode"
- }
],
"uuid_attribute": ""
},
diff --git a/ipaserver/plugins/trust.py b/ipaserver/plugins/trust.py
index 744be93c7..8fd663b77 100644
--- a/ipaserver/plugins/trust.py
+++ b/ipaserver/plugins/trust.py
@@ -1477,10 +1477,6 @@ class trustdomain(LDAPObject):
cli_name='sid',
label=_('Domain Security Identifier'),
),
- Str('ipanttrustpartner?',
- label=_('Trusted domain partner'),
- flags=['no_display', 'no_option'],
- ),
)
# LDAPObject.get_dn() only passes all but last element of keys and no kwargs
generated by cgit (git 2.34.1) at 2024-06-25 15:48:10 +0000