summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-11-25 11:32:39 -0500
committerJason Gerard DeRose <jderose@redhat.com>2009-11-30 18:12:11 -0700
commit0dcaea8d16d976e1d132b6eac03bb2961b6396ae (patch)
treec228502e3e768a182328ece59b6874e90137bd7b /ipa-client/ipa-install
parentab1667f3c1607a22c6df49ceba58274347bc5826 (diff)
downloadfreeipa-0dcaea8d16d976e1d132b6eac03bb2961b6396ae.tar.gz
freeipa-0dcaea8d16d976e1d132b6eac03bb2961b6396ae.tar.xz
freeipa-0dcaea8d16d976e1d132b6eac03bb2961b6396ae.zip
Add server option to ipa-join so the IPA server can be specified.
This is needed because in the client installer we actually perform the join before creating the configuration files that join uses. All we need is the IPA server to join to and we have that from the CLI options so use that.
Diffstat (limited to 'ipa-client/ipa-install')
-rw-r--r--ipa-client/ipa-install/ipa-client-install2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 0cc37deb..54d11cd8 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -376,7 +376,7 @@ def main():
print "Test kerberos configuration failed"
return 1
os.environ['KRB5_CONFIG'] = krb_name
- join_args = ["/usr/sbin/ipa-join"]
+ join_args = ["/usr/sbin/ipa-join", "-s", cli_server]
if options.principal is not None:
principal = options.principal
if principal.find('@') == -1: