X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=63f19d769679ccd9287c59e9e048aac7fc471230;hb=f8407f2ed06cdc0cca8c2421023255886c12ea6d;hp=08bdd39e425275c0b980363f51403750519227ab;hpb=2458360e75aa46091f60c16e041c07bffe2edefb;p=onak.git
diff --git a/onak.c b/onak.c
index 08bdd39..63f19d7 100644
--- a/onak.c
+++ b/onak.c
@@ -15,8 +15,7 @@
* 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 .
*/
#include
@@ -28,6 +27,8 @@
#include
#include
+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
@@ -42,7 +43,6 @@
#include "onak-conf.h"
#include "parsekey.h"
#include "photoid.h"
-#include "version.h"
void find_keys(struct onak_dbctx *dbctx,
char *search, uint64_t keyid,
@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
logthing(LOGTHING_INFO, "Finished reading %d keys.",
result);
- result = cleankeys(keys);
+ result = cleankeys(&keys, config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
@@ -289,7 +289,8 @@ int main(int argc, char *argv[])
result);
if (keys != NULL) {
- result = cleankeys(keys);
+ result = cleankeys(&keys,
+ config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
@@ -318,6 +319,13 @@ int main(int argc, char *argv[])
free_publickey(keys);
keys = NULL;
}
+ } else if (!strcmp("dumpconfig", argv[optind])) {
+ if ((argc - optind) == 2) {
+ writeconfig(argv[optind + 1]);
+ } else {
+ /* Dump config to stdout */
+ writeconfig(NULL);
+ }
} else if ((argc - optind) == 2) {
search = argv[optind+1];
if (search != NULL && strlen(search) == 42 &&
@@ -430,7 +438,7 @@ int main(int argc, char *argv[])
dbctx->starttrans(dbctx);
if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
dbctx->delete_key(dbctx, keyid, true);
- cleankeys(keys);
+ cleankeys(&keys, config.clean_policies);
dbctx->store_key(dbctx, keys, true, false);
} else {
puts("Key not found");
@@ -444,6 +452,7 @@ int main(int argc, char *argv[])
cleanuplogthing();
cleanupconfig();
+ free(configfile);
return rc;
}