summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2012-02-28 13:24:41 +0200
committerMartin Kosek <mkosek@redhat.com>2012-06-07 09:39:09 +0200
commita7420c1e83e22a2d441804a7cc5bcf3815a89e47 (patch)
tree72352e34cce1ad3973ff90c73253941dbfdeb093 /install
parentdd244c02dd544f518574f45931342b97fd9e0162 (diff)
downloadfreeipa-a7420c1e83e22a2d441804a7cc5bcf3815a89e47.tar.gz
freeipa-a7420c1e83e22a2d441804a7cc5bcf3815a89e47.tar.xz
freeipa-a7420c1e83e22a2d441804a7cc5bcf3815a89e47.zip
Add trust management for Active Directory trusts
Diffstat (limited to 'install')
-rw-r--r--install/share/Makefile.am1
-rw-r--r--install/share/replica-s4u2proxy.ldif2
-rw-r--r--install/share/smb.conf.empty2
-rwxr-xr-xinstall/tools/ipa-adtrust-install1
4 files changed, 5 insertions, 1 deletions
diff --git a/install/share/Makefile.am b/install/share/Makefile.am
index 243fc2a11..81fd0dc15 100644
--- a/install/share/Makefile.am
+++ b/install/share/Makefile.am
@@ -33,6 +33,7 @@ app_DATA = \
krbrealm.con.template \
preferences.html.template \
smb.conf.template \
+ smb.conf.empty \
referint-conf.ldif \
dna.ldif \
master-entry.ldif \
diff --git a/install/share/replica-s4u2proxy.ldif b/install/share/replica-s4u2proxy.ldif
index 410eceb1c..ce58365c5 100644
--- a/install/share/replica-s4u2proxy.ldif
+++ b/install/share/replica-s4u2proxy.ldif
@@ -4,7 +4,7 @@ add: memberPrincipal
memberPrincipal: HTTP/$FQDN@$REALM
-
add: ipaAllowedTarget
-ipaAllowedTarget: cn=ipa-cifs-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX
+ipaAllowedTarget: 'cn=ipa-cifs-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX'
dn: cn=ipa-ldap-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX
changetype: modify
diff --git a/install/share/smb.conf.empty b/install/share/smb.conf.empty
new file mode 100644
index 000000000..6d1e6265d
--- /dev/null
+++ b/install/share/smb.conf.empty
@@ -0,0 +1,2 @@
+[global]
+
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index 0dfc6eba6..5b7dc9fdf 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -131,6 +131,7 @@ def main():
break
# Check we have a public IP that is associated with the hostname
+ ip = None
try:
if options.ip_address:
ip = ipautil.CheckedIPAddress(options.ip_address, match_local=True)