projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup log file on package purge (Debian bug #338516)
[onak.git]
/
add.c
diff --git
a/add.c
b/add.c
index 189444e294fb2d83af8869b3c943504c30fba810..167e5bd46aa13a0380fcd8e288eecce19f2cb478 100644
(file)
--- a/
add.c
+++ b/
add.c
@@
-23,7
+23,6
@@
#include "merge.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "merge.h"
#include "onak-conf.h"
#include "parsekey.h"
-#include "sendsync.h"
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
@@
-69,8
+68,13
@@
int main(int argc, char *argv[])
count);
printf("Storing %d keys.\n", count);
end_html();
count);
printf("Storing %d keys.\n", count);
end_html();
- fclose(stdout);
- fclose(stderr);
+ if (stdout != NULL && fileno(stdout) != -1) {
+ fclose(stdout);
+ }
+ if (stderr != NULL && stderr != stdout &&
+ fileno(stderr) != -1) {
+ fclose(stderr);
+ }
catchsignals();
initdb(false);
catchsignals();
initdb(false);
@@
-78,14
+82,15
@@
int main(int argc, char *argv[])
logthing(LOGTHING_INFO, "%d keys cleaned.",
count);
logthing(LOGTHING_INFO, "%d keys cleaned.",
count);
- count = update_keys(&keys);
+ count = update_keys(&keys
, true
);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
count);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
count);
+
if (keys != NULL) {
if (keys != NULL) {
- sendkeysync(keys);
free_publickey(keys);
keys = NULL;
}
free_publickey(keys);
keys = NULL;
}
+
cleanupdb();
} else {
puts("No OpenPGP packets found in input.");
cleanupdb();
} else {
puts("No OpenPGP packets found in input.");