From d03fb43680f43f037a53b88e8b2772885ec11cc1 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Feb 26 2015 19:05:46 +0000
Subject: Correct use of certsave-specific status codes


---

diff --git a/src/certsave-int.h b/src/certsave-int.h
index 423a22f..f452642 100644
--- a/src/certsave-int.h
+++ b/src/certsave-int.h
@@ -23,7 +23,7 @@ enum cm_certsave_status {
 	CM_CERTSAVE_STATUS_INTERNAL_ERROR = 1,
 	CM_CERTSAVE_STATUS_SUBJECT_CONFLICT = 2,
 	CM_CERTSAVE_STATUS_NICKNAME_CONFLICT = 3,
-	CM_CERTSAVE_STATUS_INTERNAL = 4,
+	CM_CERTSAVE_STATUS_INITIALIZING = 4,
 	CM_CERTSAVE_STATUS_PERMS = 5,
 	CM_CERTSAVE_STATUS_AUTH = 6,
 	CM_CERTSAVE_STATUS_NO_TOKEN = 7,
diff --git a/src/certsave-n.c b/src/certsave-n.c
index 48c6fd1..1763278 100644
--- a/src/certsave-n.c
+++ b/src/certsave-n.c
@@ -138,10 +138,10 @@ cm_certsave_n_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
 		}
 		switch (ec) {
 		case PR_NO_ACCESS_RIGHTS_ERROR: /* EACCES or EPERM */
-			status = CM_SUB_STATUS_ERROR_PERMS;
+			status = CM_CERTSAVE_STATUS_PERMS;
 			break;
 		default:
-			status = CM_SUB_STATUS_ERROR_INITIALIZING;
+			status = CM_CERTSAVE_STATUS_INITIALIZING;
 			break;
 		}
 	} else {
diff --git a/src/certsave-o.c b/src/certsave-o.c
index 69c3b91..bc8fc70 100644
--- a/src/certsave-o.c
+++ b/src/certsave-o.c
@@ -182,7 +182,7 @@ cm_certsave_o_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
 		if (next_keyfile == NULL) {
 			cm_log(1, "Error building key file name "
 			       "for reading: %s.\n", strerror(errno));
-			_exit(CM_SUB_STATUS_INTERNAL_ERROR);
+			_exit(CM_CERTSAVE_STATUS_INTERNAL_ERROR);
 		}
 		next_key = read_file_contents(next_keyfile, "next key file",
 					      PR_TRUE);
@@ -212,7 +212,7 @@ cm_certsave_o_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
 						cm_log(1, "Error building key file name "
 						       "for writing: %s.\n",
 						       strerror(errno));
-						_exit(CM_SUB_STATUS_INTERNAL_ERROR);
+						_exit(CM_CERTSAVE_STATUS_INTERNAL_ERROR);
 					}
 				}
 			}