Attachment 295452 Details for Bug 433347 – Add some additional error checking

[patch] Add some additional error checking

freeipa-696-errors.patch (text/plain), 1.92 KB, created by Rob Crittenden on 2008-02-20 21:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2008-02-20 21:33:17 UTC

Size: 1.92 KB

patch

obsolete

># HG changeset patch
># User Rob Crittenden <rcritten@redhat.com>
># Date 1203543092 18000
># Node ID 54d9e9f247560062ece4988e1f9fef156d34c295
># Parent  1fd756f7759ccba8cc84f53d27481e94d4935c6e
>Add some additional error handling
>
>433347
>
>diff -r 1fd756f7759c -r 54d9e9f24756 ipa-server/ipa-install/ipa-replica-prepare
>--- a/ipa-server/ipa-install/ipa-replica-prepare	Wed Feb 20 12:51:03 2008 -0500
>+++ b/ipa-server/ipa-install/ipa-replica-prepare	Wed Feb 20 16:31:32 2008 -0500
>@@ -92,10 +92,13 @@ def export_certdb(realm_name, ds_dir, di
>        fname is the filename of the PKCS#12 file for this cert (minus the .p12).
>        subject is the subject of the certificate we are creating
>     """
>-    ds_ca = certs.CertDB(dsinstance.config_dirname(dsinstance.realm_to_serverid(realm_name)))
>-    ca = certs.CertDB(dir)
>-    ca.create_from_cacert(ds_ca.cacert_fname)
>-    ca.create_server_cert("Server-Cert", subject, ds_ca)
>+    try:
>+        ds_ca = certs.CertDB(dsinstance.config_dirname(dsinstance.realm_to_serverid(realm_name)))
>+        ca = certs.CertDB(dir)
>+        ca.create_from_cacert(ds_ca.cacert_fname)
>+        ca.create_server_cert("Server-Cert", subject, ds_ca)
>+    except Exception, e:
>+        raise e
> 
>     pkcs12_fname = dir + "/" + fname + ".p12"
>     passwd_fname = dir + "/pwdfile.txt"
>diff -r 1fd756f7759c -r 54d9e9f24756 ipa-server/ipaserver/certs.py
>--- a/ipa-server/ipaserver/certs.py	Wed Feb 20 12:51:03 2008 -0500
>+++ b/ipa-server/ipaserver/certs.py	Wed Feb 20 16:31:32 2008 -0500
>@@ -73,7 +73,10 @@ class CertDB(object):
>         try:
>             f=open("/usr/share/ipa/serial","r")
>             r = f.readline()
>-            self.cur_serial = int(r) + 1
>+            try:
>+                self.cur_serial = int(r) + 1
>+            except ValueError:
>+                raise RuntimeError("The value in /usr/share/ipa/serial is not an integer")
>             f.close()
>         except IOError, e:
>             if e.errno == errno.ENOENT:

Actions: View | Diff

Attachments on bug 433347: 295452