Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Ansible FreeIPA
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Ansible FreeIPA
Commits
99c08918
Commit
99c08918
authored
7 years ago
by
Thomas Woerner
Browse files
Options
Downloads
Patches
Plain Diff
library/ipajoin.py: Fixed white spaces for comments and imports
parent
ea77aa28
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
library/ipajoin.py
+10
-8
10 additions, 8 deletions
library/ipajoin.py
with
10 additions
and
8 deletions
library/ipajoin.py
+
10
−
8
View file @
99c08918
...
@@ -139,14 +139,16 @@ try:
...
@@ -139,14 +139,16 @@ try:
except
ImportError
:
except
ImportError
:
from
ipapython.ipautil
import
kinit_keytab
,
kinit_password
from
ipapython.ipautil
import
kinit_keytab
,
kinit_password
try
:
try
:
from
ipaclient.install.client
import
configure_krb5_conf
,
get_ca_certs
,
SECURE_PATH
from
ipaclient.install.client
import
configure_krb5_conf
,
get_ca_certs
,
\
SECURE_PATH
except
ImportError
:
except
ImportError
:
# Create temporary copy of ipa-client-install script (as
# Create temporary copy of ipa-client-install script (as
# ipa_client_install.py) to be able to import the script easily and also
# ipa_client_install.py) to be able to import the script easily
# to remove the global finally clause in which the generated ccache file
# and also to remove the global finally clause in which the
# gets removed. The ccache file will be needed in the next step.
# generated ccache file gets removed. The ccache file will be
# This is done in a temporary directory that gets removed right after
# needed in the next step.
# ipa_client_install has been imported.
# This is done in a temporary directory that gets removed right
# after ipa_client_install has been imported.
import
shutil
import
shutil
temp_dir
=
tempfile
.
mkdtemp
(
dir
=
"
/tmp
"
)
temp_dir
=
tempfile
.
mkdtemp
(
dir
=
"
/tmp
"
)
sys
.
path
.
append
(
temp_dir
)
sys
.
path
.
append
(
temp_dir
)
...
@@ -338,8 +340,8 @@ def main():
...
@@ -338,8 +340,8 @@ def main():
if
principal
:
if
principal
:
run
([
"
kdestroy
"
],
raiseonerr
=
False
,
env
=
env
)
run
([
"
kdestroy
"
],
raiseonerr
=
False
,
env
=
env
)
# Obtain the TGT. We do it with the temporary krb5.conf, so
tha
t
# Obtain the TGT. We do it with the temporary krb5.conf, sot
# only the KDC we're installing under is contacted.
#
tha
only the KDC we're installing under is contacted.
# Other KDCs might not have replicated the principal yet.
# Other KDCs might not have replicated the principal yet.
# Once we have the TGT, it's usable on any server.
# Once we have the TGT, it's usable on any server.
try
:
try
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment