Import Upstream version 4.12.4

install/tools/ipa-adtrust-install.in

@@ -29,19 +29,17 @@ import sys
 
 import six
 
-from optparse import SUPPRESS_HELP  # pylint: disable=deprecated-module
-
 from ipalib.install import sysrestore
 from ipaserver.install import adtrust, service
 from ipaserver.install.installutils import (
     read_password,
     check_server_configuration,
     run_script)
-from ipapython.admintool import ScriptError
+from ipapython.admintool import ScriptError, admin_cleanup_global_argv
 from ipapython import version
 from ipapython import ipautil
 from ipalib import api, errors, krb_utils
-from ipapython.config import IPAOptionParser
+from ipapython.config import IPAOptionParser, SUPPRESS_HELP
 from ipaplatform.paths import paths
 from ipapython.ipa_log_manager import standard_logging_setup
 
@@ -50,7 +48,7 @@ if six.PY3:
 
 logger = logging.getLogger(os.path.basename(__file__))
 
-log_file_name = paths.IPASERVER_INSTALL_LOG
+log_file_name = paths.IPASERVER_ADTRUST_INSTALL_LOG
 
 
 def parse_options():
@@ -64,10 +62,11 @@ def parse_options():
     parser.add_option("--no-msdcs", dest="no_msdcs", action="store_true",
                       default=False, help=SUPPRESS_HELP)
 
-    parser.add_option("--rid-base", dest="rid_base", type=int, default=1000,
+    parser.add_option("--rid-base", dest="rid_base", type=int,
+                      default=adtrust.DEFAULT_PRIMARY_RID_BASE,
                       help="Start value for mapping UIDs and GIDs to RIDs")
     parser.add_option("--secondary-rid-base", dest="secondary_rid_base",
-                      type=int, default=100000000,
+                      type=int, default=adtrust.DEFAULT_SECONDARY_RID_BASE,
                       help="Start value of the secondary range for mapping "
                            "UIDs and GIDs to RIDs")
     parser.add_option("-U", "--unattended", dest="unattended",
@@ -94,6 +93,7 @@ def parse_options():
 
     options, _args = parser.parse_args()
     safe_options = parser.get_safe_opts(options)
+    admin_cleanup_global_argv(parser, options, sys.argv)
 
     return safe_options, options
 
@@ -141,11 +141,11 @@ def main():
           "==============")
     print("This program will setup components needed to establish trust to "
           "AD domains for")
-    print("the FreeIPA Server.")
+    print("the IPA Server.")
     print("")
     print("This includes:")
     print("  * Configure Samba")
-    print("  * Add trust related objects to FreeIPA LDAP server")
+    print("  * Add trust related objects to IPA LDAP server")
     # TODO:
     # print "  * Add a SID to all users and Posix groups"
     print("")
@@ -161,7 +161,7 @@ def main():
     api.bootstrap(
         in_server=True,
         debug=options.debug,
-        context='install',
+        context='installer',
         confdir=paths.ETC_IPA
     )
     api.finalize()
@@ -201,7 +201,7 @@ def main():
         if not (user['uid'][0] in group['member_user'] and
                 group['cn'][0] in user['memberof_group']):
             raise errors.RequirementError(name='admins group membership')
-    except errors.RequirementError as e:
+    except errors.RequirementError:
         raise ScriptError(
             "Must have administrative privileges to setup AD trusts on server"
         )
@@ -209,6 +209,8 @@ def main():
         raise ScriptError(
             "Unrecognized error during check of admin rights: %s" % e)
 
+    # Force options.setup_adtrust
+    options.setup_adtrust = True
     adtrust.install_check(True, options, api)
     adtrust.install(True, options, fstore, api)