X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=4e03719a82345819a340c3381a8ec3edb9035ba2;hb=4127b47cd6603d328e540f4f69f66fad9b303fa7;hp=a33b0c86587b276b770e48e413b537b8ba233ca1;hpb=20902952625408183946472e70d0cb2a2d17934d;p=onak.git

diff --git a/add.c b/add.c
index a33b0c8..4e03719 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));
 
@@ -77,13 +89,13 @@ int main(int argc, char *argv[])
 				fclose(stderr);
 			}
 			catchsignals();
-			config.dbbackend->initdb(false);
+			dbctx = config.dbinit(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);
 
@@ -92,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();