|
 |
9b702c2 |
Index: OpenDNSSEC/enforcer/enforcerd/enforcer.c
|
|
|
9b702c2 |
===================================================================
|
|
|
9b702c2 |
--- OpenDNSSEC/enforcer/enforcerd/enforcer.c (revision 6815)
|
|
|
9b702c2 |
+++ OpenDNSSEC/enforcer/enforcerd/enforcer.c (revision 6816)
|
|
|
9b702c2 |
@@ -1293,7 +1293,7 @@
|
|
|
9b702c2 |
{
|
|
|
9b702c2 |
int NewDS;
|
|
|
9b702c2 |
status2 = commGenSignConf(zone_name, zone_id, current_filename, policy, &signer_flag, config->interval, config->manualKeyGeneration, config->DSSubmitCmd, config->DSSubCKA_ID, &NewDS);
|
|
|
9b702c2 |
- if (status2 != 0) {
|
|
|
9b702c2 |
+ if (status2 == 0) {
|
|
|
9b702c2 |
/* If the DS set changed then log/do something about it */
|
|
|
9b702c2 |
if (NewDS == 1) {
|
|
|
9b702c2 |
log_msg(config, LOG_INFO, "DSChanged");
|
|
|
9b702c2 |
@@ -1655,8 +1655,11 @@
|
|
|
9b702c2 |
if (system(signer_command))
|
|
|
9b702c2 |
{
|
|
|
9b702c2 |
log_msg(NULL, LOG_ERR, "Could not call signer engine to update all zones");
|
|
|
9b702c2 |
- log_msg(NULL, LOG_INFO, "Will continue: call 'ods-signer update --all' to manually update all zones");
|
|
|
9b702c2 |
+ log_msg(NULL, LOG_INFO, "Will continue: call '%s' to manually update all zones", signer_command);
|
|
|
9b702c2 |
}
|
|
|
9b702c2 |
+ else {
|
|
|
9b702c2 |
+ log_msg(NULL, LOG_INFO, "Called signer engine: %s", signer_command);
|
|
|
9b702c2 |
+ }
|
|
|
9b702c2 |
|
|
|
9b702c2 |
StrFree(signer_command);
|
|
|
9b702c2 |
} else {
|
|
|
9b702c2 |
@@ -1693,8 +1696,8 @@
|
|
|
9b702c2 |
round potentially different behaviour of rename over existing
|
|
|
9b702c2 |
file.) */
|
|
|
9b702c2 |
int gencnt; /* Number of keys in generate state */
|
|
|
9b702c2 |
+ char *signer_command; /* how we will call the signer */
|
|
|
9b702c2 |
#ifndef ENFORCER_USE_WORKERS
|
|
|
9b702c2 |
- char *signer_command; /* how we will call the signer */
|
|
|
9b702c2 |
int NewDS = 0; /* Did we change the DS Set in any way? */
|
|
|
9b702c2 |
#endif
|
|
|
9b702c2 |
char* datetime = DtParseDateTimeString("now");
|
|
|
9b702c2 |
@@ -1954,7 +1957,6 @@
|
|
|
9b702c2 |
return -1;
|
|
|
9b702c2 |
}
|
|
|
9b702c2 |
|
|
|
9b702c2 |
-#ifndef ENFORCER_USE_WORKERS
|
|
|
9b702c2 |
if (*signer_flag == 1) {
|
|
|
9b702c2 |
/* call the signer engine to tell it that something changed */
|
|
|
9b702c2 |
/* TODO for beta version connect straight to the socket
|
|
|
9b702c2 |
@@ -1970,13 +1972,15 @@
|
|
|
9b702c2 |
if (status != 0)
|
|
|
9b702c2 |
{
|
|
|
9b702c2 |
log_msg(NULL, LOG_ERR, "Could not call signer engine");
|
|
|
9b702c2 |
- log_msg(NULL, LOG_INFO, "Will continue: call 'ods-signer update' to manually update zones");
|
|
|
9b702c2 |
+ log_msg(NULL, LOG_INFO, "Will continue: call '%s' to manually update the zone", signer_command);
|
|
|
9b702c2 |
*signer_flag = 0;
|
|
|
9b702c2 |
}
|
|
|
9b702c2 |
+ else {
|
|
|
9b702c2 |
+ log_msg(NULL, LOG_INFO, "Called signer engine: %s", signer_command);
|
|
|
9b702c2 |
+ }
|
|
|
9b702c2 |
|
|
|
9b702c2 |
StrFree(signer_command);
|
|
|
9b702c2 |
}
|
|
|
9b702c2 |
-#endif
|
|
|
9b702c2 |
}
|
|
|
9b702c2 |
else {
|
|
|
9b702c2 |
log_msg(NULL, LOG_INFO, "No change to: %s", current_filename);
|