oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Log client status changes

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2012-02-15 21:05:05 -08:00
parent bf37778dbd
commit a802c4799d
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/kadm5/ipropd_slave.c
View File

@@ -460,12 +460,16 @@ receive_everything (krb5_context context, int fd,
} }
static void static void
slave_status(const char *file, const char *status, ...) slave_status(krb5_context context,
__attribute__ ((format (printf, 2, 3))); const char *file,
const char *status, ...)
__attribute__ ((format (printf, 3, 4)));
static void static void
slave_status(const char *file, const char *fmt, ...) slave_status(krb5_context context,
const char *file,
const char *fmt, ...)
{ {
char *status = NULL; char *status = NULL;
va_list args; va_list args;
@@ -478,6 +482,7 @@ slave_status(const char *file, const char *fmt, ...)
unlink(file); unlink(file);
return; return;
} }
krb5_warnx(context, "slave status change: %s", status);
rk_dumpdata(file, status, len); rk_dumpdata(file, status, len);
free(status); free(status);
@@ -494,7 +499,7 @@ is_up_to_date(krb5_context context, const char *file,
unlink(file); unlink(file);
return; return;
} }
slave_status(file, "up-to-date with version: %lu at %s\n", slave_status(context, file, "up-to-date with version: %lu at %s\n",
(unsigned long)server_context->log_context.version, buf); (unsigned long)server_context->log_context.version, buf);
} }
@@ -607,7 +612,7 @@ main(int argc, char **argv)
krb5_errx(context, 1, "can't allocate status file buffer"); krb5_errx(context, 1, "can't allocate status file buffer");
} }
slave_status(status_file, "bootstrapping\n"); slave_status(context, status_file, "bootstrapping\n");
#ifdef SUPPORT_DETACH #ifdef SUPPORT_DETACH
if (detach_from_console) if (detach_from_console)
@@ -625,7 +630,7 @@ main(int argc, char **argv)
if (time_before_lost < 0) if (time_before_lost < 0)
krb5_errx (context, 1, "couldn't parse time: %s", server_time_lost); krb5_errx (context, 1, "couldn't parse time: %s", server_time_lost);
slave_status(status_file, "getting credentials from keytab/database\n"); slave_status(context, status_file, "getting credentials from keytab/database\n");
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
if(realm) { if(realm) {
@@ -643,7 +648,7 @@ main(int argc, char **argv)
server_context = (kadm5_server_context *)kadm_handle; server_context = (kadm5_server_context *)kadm_handle;
slave_status(status_file, "creating log file\n"); slave_status(context, status_file, "creating log file\n");
ret = kadm5_log_init (server_context); ret = kadm5_log_init (server_context);
if (ret) if (ret)
@@ -682,7 +687,7 @@ main(int argc, char **argv)
} }
before = now; before = now;
slave_status(status_file, "connecting to master: %s\n", master); slave_status(context, status_file, "connecting to master: %s\n", master);
master_fd = connect_to_master (context, master, port_str); master_fd = connect_to_master (context, master, port_str);
if (master_fd < 0) if (master_fd < 0)
@@ -715,7 +720,7 @@ main(int argc, char **argv)
connected = TRUE; connected = TRUE;
slave_status(status_file, "connected to master, waiting instructions\n"); slave_status(context, status_file, "connected to master, waiting instructions\n");
while (connected && !exit_flag) { while (connected && !exit_flag) {
krb5_data out; krb5_data out;
@@ -796,7 +801,7 @@ main(int argc, char **argv)
} }
slave_status(status_file, "disconnected from master"); slave_status(context, status_file, "disconnected from master");
retry: retry:
if (connected == FALSE) if (connected == FALSE)
krb5_warnx (context, "disconnected for server"); krb5_warnx (context, "disconnected for server");
@@ -809,7 +814,7 @@ main(int argc, char **argv)
reconnect += backoff; reconnect += backoff;
if (reconnect > reconnect_max) { if (reconnect > reconnect_max) {
slave_status(status_file, "disconnected from master for a long time"); slave_status(context, status_file, "disconnected from master for a long time");
reconnect = reconnect_max; reconnect = reconnect_max;
} }
} }