IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

DNS Locations: hide option --no-msdcs in adtrust-install

Browse Source 
Since DNS location mechanism is active, this option has no effect,
because records are generate dynamically.

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

Reviewed-By: Petr Spacek <pspacek@redhat.com>
This commit is contained in:
Martin Basti
2016-06-21 18:17:55 +02:00
parent e42f662b78
commit 218734ba5a
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ipaserver/install/adtrustinstance.py
View File

@@ -124,7 +124,6 @@ class ADTRUSTInstance(service.Service):
def __init__(self, fstore=None):
self.netbios_name = None
self.reset_netbios_name = None
self.no_msdcs = None
self.add_sids = None
self.smbd_user = None
self.smb_dn_pwd = None
@@ -585,17 +584,14 @@ class ADTRUSTInstance(service.Service):
err_msg = None
if self.no_msdcs:
err_msg = '--no-msdcs was given, special DNS service records ' \
'are not added to local DNS server'
ret = api.Command['dns_is_enabled']()
if not ret['result']:
err_msg = "DNS management was not enabled at install time."
else:
ret = api.Command['dns_is_enabled']()
if not ret['result']:
err_msg = "DNS management was not enabled at install time."
else:
if not dns_zone_exists(zone):
err_msg = "DNS zone %s cannot be managed " \
"as it is not defined in IPA" % zone
if not dns_zone_exists(zone):
err_msg = (
"DNS zone %s cannot be managed as it is not defined in "
"IPA" % zone)
if err_msg:
self.print_msg(err_msg)
@@ -766,7 +762,7 @@ class ADTRUSTInstance(service.Service):
def setup(self, fqdn, realm_name, netbios_name,
reset_netbios_name, rid_base, secondary_rid_base,
no_msdcs=False, add_sids=False, smbd_user="samba",
add_sids=False, smbd_user="samba",
enable_compat=False):
self.fqdn = fqdn
self.realm = realm_name
@@ -774,7 +770,6 @@ class ADTRUSTInstance(service.Service):
self.reset_netbios_name = reset_netbios_name
self.rid_base = rid_base
self.secondary_rid_base = secondary_rid_base
self.no_msdcs = no_msdcs
self.add_sids = add_sids
self.enable_compat = enable_compat
self.smbd_user = smbd_user