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

diff --git a/add.c b/add.c
index 6f919be..c3a54a7 100644
--- a/add.c
+++ b/add.c
@@ -13,11 +13,10 @@
  * 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.
+ * 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>
@@ -28,10 +27,8 @@
 #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"
 
@@ -43,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));
 
@@ -88,13 +86,13 @@ int main(int argc, char *argv[])
 				fclose(stderr);
 			}
 			catchsignals();
-			config.dbbackend->initdb(false);
+			dbctx = config.dbinit(config.backend, false);
 			
-			count = cleankeys(keys);
+			count = cleankeys(&keys, config.clean_policies);
 			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);
 
@@ -103,7 +101,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();