Add some additional error handling

433347

ipa-server/ipa-install/ipa-replica-prepare

@@ -92,10 +92,13 @@ def export_certdb(realm_name, ds_dir, dir, fname, subject):
        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"

ipa-server/ipaserver/certs.py

@@ -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: