X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=c3a54a7295601947fc46b8277dbaa4731e324901;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=a784fac358fb4d9565c84dfb274734b2c61d89df;hpb=394938c479925750ffe56c28d281945ba4003a14;p=onak.git

diff --git a/add.c b/add.c
index a784fac..c3a54a7 100644
--- a/add.c
+++ b/add.c
@@ -1,28 +1,36 @@
 /*
  * 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, see <https://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "armor.h"
 #include "cleankey.h"
+#include "cleanup.h"
 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
-#include "keystructs.h"
 #include "log.h"
 #include "mem.h"
-#include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"
-#include "sendsync.h"
 
 int main(int argc, char *argv[])
 {
@@ -32,6 +40,7 @@ int main(int argc, char *argv[])
 	struct buffer_ctx            ctx;
 	int                          count = 0;
 	int                          i;
+	struct onak_dbctx           *dbctx;
 
 	memset(&ctx, 0, sizeof(ctx));
 
@@ -63,27 +72,36 @@ int main(int argc, char *argv[])
 					&ctx,
 					&packets);
 		if (packets != NULL) {
-			printf("Storing %d keys.\n",
-				parse_keys(packets, &keys));
+			count = parse_keys(packets, &keys);
+			logthing(LOGTHING_NOTICE, "Received %d keys.",
+				count);
+			printf("Key block added to key server database.\n");
+			printf("  New public keys added: %d\n", count);
 			end_html();
-			fclose(stdout);
-			fclose(stderr);
-			initdb(false);
+			if (stdout != NULL && fileno(stdout) != -1) {
+				fclose(stdout);
+			}
+			if (stderr != NULL && stderr != stdout &&
+					fileno(stderr) != -1) {
+				fclose(stderr);
+			}
+			catchsignals();
+			dbctx = config.dbinit(config.backend, false);
 			
-			count = cleankeys(keys);
+			count = cleankeys(&keys, config.clean_policies);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					count);
 
-			count = update_keys(&keys);
-			printf("Got %d new keys.\n", count);
+			count = dbctx->update_keys(dbctx, &keys, true);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 				count);
+
 			if (keys != NULL) {
-				sendkeysync(keys);
 				free_publickey(keys);
 				keys = NULL;
 			}
-			cleanupdb();
+			
+			dbctx->cleanupdb(dbctx);
 		} else {
 			puts("No OpenPGP packets found in input.");
 			end_html();