Attachment 312683 Details for Bug 452402 – Don't assume that the Firefox autoconfig files exist.

[patch] Don't assume that the Firefox autoconfig files exist.

freeipa-65-replica.patch (text/plain), 3.20 KB, created by Rob Crittenden on 2008-07-25 21:07:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2008-07-25 21:07:20 UTC

Size: 3.20 KB

patch

obsolete

>From 62460df9f44b57ffcce71e41bf8fc8a4eb9a7ef2 Mon Sep 17 00:00:00 2001
>From: Rob Crittenden <rcrit@ipa.greyoak.com>
>Date: Fri, 25 Jul 2008 16:56:42 -0400
>Subject: [PATCH] Don't assume that the Firefox autoconfig files exist.
>
>These are created by an object-signing cert and needs to be done
>after the fact if a server is created with user-supplied PKCS#12 files.
>
>452402
>---
> ipa-server/ipa-install/ipa-replica-install |   17 +++++++++--------
> ipa-server/ipa-install/ipa-replica-prepare |    8 +++++---
> 2 files changed, 14 insertions(+), 11 deletions(-)
>
>diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install
>index 31fd4cc..10f372e 100644
>--- a/ipa-server/ipa-install/ipa-replica-install
>+++ b/ipa-server/ipa-install/ipa-replica-install
>@@ -131,14 +131,15 @@ def install_http(config):
>     http.create_instance(config.realm_name, config.host_name, config.domain_name, False, pkcs12_info)
> 
>     # Now copy the autoconfiguration files
>-    try:
>-        shutil.copy(config.dir + "/preferences.html", "/usr/share/ipa/html/preferences.html")
>-        shutil.copy(config.dir + "/configure.jar", "/usr/share/ipa/html/configure.jar")
>-        shutil.copy(config.dir + "/ca.crt", "/usr/share/ipa/html/ca.crt")
>-        os.chmod("/usr/share/ipa/html/ca.crt", 0444)
>-    except Exception, e:
>-        print "error copying files: " + str(e)
>-        sys.exit(1)
>+    if ipautil.file_exists(config.dir + "/preferences.html"):
>+        try:
>+            shutil.copy(config.dir + "/preferences.html", "/usr/share/ipa/html/preferences.html")
>+            shutil.copy(config.dir + "/configure.jar", "/usr/share/ipa/html/configure.jar")
>+            shutil.copy(config.dir + "/ca.crt", "/usr/share/ipa/html/ca.crt")
>+            os.chmod("/usr/share/ipa/html/ca.crt", 0444)
>+        except Exception, e:
>+            print "error copying files: " + str(e)
>+            sys.exit(1)
> 
> def check_dirsrv():
>     serverids = dsinstance.check_existing_installation()
>diff --git a/ipa-server/ipa-install/ipa-replica-prepare b/ipa-server/ipa-install/ipa-replica-prepare
>index 54dc2f3..1981454 100644
>--- a/ipa-server/ipa-install/ipa-replica-prepare
>+++ b/ipa-server/ipa-install/ipa-replica-prepare
>@@ -150,12 +150,14 @@ def save_config(dir, realm_name, host_name, ds_user, domain_name):
> 
> def copy_files(realm_name, dir):
>     config_dir = dsinstance.config_dirname(dsinstance.realm_to_serverid(realm_name))
>+
>     try:
>         shutil.copy("/var/kerberos/krb5kdc/ldappwd", dir + "/ldappwd") 
>         shutil.copy("/var/kerberos/krb5kdc/kpasswd.keytab", dir + "/kpasswd.keytab") 
>-        shutil.copy("/usr/share/ipa/html/preferences.html", dir + "/preferences.html")
>-        shutil.copy("/usr/share/ipa/html/configure.jar", dir + "/configure.jar")
>-        shutil.copy(config_dir + "/cacert.asc", dir + "/ca.crt")
>+        if ipautil.file_exists("/usr/share/ipa/html/preferences.html"):
>+            shutil.copy("/usr/share/ipa/html/preferences.html", dir + "/preferences.html")
>+            shutil.copy("/usr/share/ipa/html/configure.jar", dir + "/configure.jar")
>+            shutil.copy(config_dir + "/cacert.asc", dir + "/ca.crt")
>     except Exception, e:
>         print "error copying files: " + str(e)
>         sys.exit(1)
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 452402: 311595 | 312683