X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=877af11f2055aa46d549a2e66b6971e6fc1413a2;hb=5d859953e393a2539e67df3ce73798e7029cf5b9;hp=3a9161f6b86c5231df65727f24031af4c618aad0;hpb=5b3f77c7fbafb036d20a1577ed74f475e94ed821;p=onak.git

diff --git a/add.c b/add.c
index 3a9161f..877af11 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>
@@ -32,6 +43,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));
 
@@ -66,7 +78,8 @@ 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();
 			if (stdout != NULL && fileno(stdout) != -1) {
 				fclose(stdout);
@@ -76,13 +89,13 @@ int main(int argc, char *argv[])
 				fclose(stderr);
 			}
 			catchsignals();
-			config.dbbackend->initdb(false);
+			dbctx = config.dbinit(config.backend, false);
 			
 			count = cleankeys(keys);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					count);
 
-			count = config.dbbackend->update_keys(&keys, true);
+			count = dbctx->update_keys(dbctx, &keys, true);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 				count);
 
@@ -91,7 +104,7 @@ int main(int argc, char *argv[])
 				keys = NULL;
 			}
 			
-			config.dbbackend->cleanupdb();
+			dbctx->cleanupdb(dbctx);
 		} else {
 			puts("No OpenPGP packets found in input.");
 			end_html();