summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorJohn Dennis <jdennis@redhat.com>2007-12-04 10:08:08 -0500
committerJohn Dennis <jdennis@redhat.com>2007-12-04 10:08:08 -0500
commitd53915954e68ad2fa1625ed016e7e65cd6f4e4e0 (patch)
tree6963257f9c07a23cbe7a33d621edae5e7c327d9f /ipa-client
parent4e1d291d15e198a0517a2c6787f865fe41147440 (diff)
parent299e45769811c7573d1389e5eb25643e62b1d128 (diff)
downloadfreeipa.git-d53915954e68ad2fa1625ed016e7e65cd6f4e4e0.tar.gz
freeipa.git-d53915954e68ad2fa1625ed016e7e65cd6f4e4e0.tar.xz
freeipa.git-d53915954e68ad2fa1625ed016e7e65cd6f4e4e0.zip
merge
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/configure.ac2
-rw-r--r--ipa-client/ipa-install/ipa-client-install6
2 files changed, 5 insertions, 3 deletions
diff --git a/ipa-client/configure.ac b/ipa-client/configure.ac
index 9d060d9a..b50928da 100644
--- a/ipa-client/configure.ac
+++ b/ipa-client/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.59c)
+AC_PREREQ(2.59)
AC_INIT([ipa-client],
[0.5.0],
[https://hosted.fedoraproject.org/projects/freeipa/newticket])
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index fccdac3b..bc8e7c9c 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -131,8 +131,10 @@ def main():
opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'},
{'name':'empty', 'type':'empty'}]
- defopts.append({'name':'server', 'type':'option', 'value':ds.getServerName()})
- defopts.append({'name':'realm', 'type':'option', 'value':ds.getRealmName()})
+
+ #[defaults]
+ defopts = [{'name':'server', 'type':'option', 'value':ds.getServerName()},
+ {'name':'realm', 'type':'option', 'value':ds.getRealmName()}]
opts.append({'name':'defaults', 'type':'section', 'value':defopts})
opts.append({'name':'empty', 'type':'empty'})