Prevent read_openpgp_stream from returning empty packets

[onak.git] / add.c

diff --git a/add.c b/add.c
index 167e5bd46aa13a0380fcd8e288eecce19f2cb478..6f919becfe7e30b077cfd11d079851a478fe0091 100644 (file)
--- 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,7 +77,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 +88,13 @@ int main(int argc, char *argv[])
                                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);
 
@@ -91,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();