X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/7350475e98ed6302e0143a7e7c9ab7877ea58a1a..94ffe75fd3251c74320167cf94604e73fdb99dfc:/add.c?ds=sidebyside

diff --git a/add.c b/add.c
index 10627f2..6f919be 100644
--- a/add.c
+++ b/add.c
@@ -1,9 +1,20 @@
 /*
  * add.c - CGI to add keys.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <errno.h>
@@ -66,18 +77,24 @@ int main(int argc, char *argv[])
 			count = parse_keys(packets, &keys);
 			logthing(LOGTHING_NOTICE, "Received %d keys.",
 				count);
-			printf("Storing %d keys.\n", count);
+			printf("Key block added to key server database.\n");
+			printf("  New public keys added: %d\n", count);
 			end_html();
-			fclose(stdout);
-			fclose(stderr);
+			if (stdout != NULL && fileno(stdout) != -1) {
+				fclose(stdout);
+			}
+			if (stderr != NULL && stderr != stdout &&
+					fileno(stderr) != -1) {
+				fclose(stderr);
+			}
 			catchsignals();
-			initdb(false);
+			config.dbbackend->initdb(false);
 			
 			count = cleankeys(keys);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					count);
 
-			count = update_keys(&keys, true);
+			count = config.dbbackend->update_keys(&keys, true);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 				count);
 
@@ -86,7 +103,7 @@ int main(int argc, char *argv[])
 				keys = NULL;
 			}
 			
-			cleanupdb();
+			config.dbbackend->cleanupdb();
 		} else {
 			puts("No OpenPGP packets found in input.");
 			end_html();