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

fixup error messages

Browse Source
This commit is contained in:
Love Hornquist Astrand
2012-10-01 09:54:13 -07:00
parent 0a237dc778
commit 65107e39ee
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/kadm5/ipropd_slave.c
View File

@@ -503,7 +503,7 @@ is_up_to_date(krb5_context context, const char *file,
unlink(file);
return;
}
slave_status(context, file, "up-to-date with version: %lu at %s\n",
slave_status(context, file, "up-to-date with version: %lu at %s",
(unsigned long)server_context->log_context.version, buf);
}
@@ -567,7 +567,6 @@ main(int argc, char **argv)
time_t reconnect_max;
time_t reconnect;
time_t before = 0;
int aret;
const char *master;
@@ -617,11 +616,9 @@ main(int argc, char **argv)
krb5_errx(context, 1, "can't allocate status file buffer");
}
slave_status(context, status_file, "bootstrapping\n");
#ifdef SUPPORT_DETACH
if (detach_from_console){
aret = daemon(0, 0);
int aret = daemon(0, 0);
if (aret == -1) {
/* not much to do if detaching fails... */
krb5_err(context, 1, aret, "failed to daemon(3)ise");
@@ -632,6 +629,8 @@ main(int argc, char **argv)
krb5_openlog (context, "ipropd-slave", &log_facility);
krb5_set_warn_dest(context, log_facility);
slave_status(context, status_file, "bootstrapping");
ret = krb5_kt_register(context, &hdb_kt_ops);
if(ret)
krb5_err(context, 1, ret, "krb5_kt_register");
@@ -640,7 +639,7 @@ main(int argc, char **argv)
if (time_before_lost < 0)
krb5_errx (context, 1, "couldn't parse time: %s", server_time_lost);
slave_status(context, status_file, "getting credentials from keytab/database\n");
slave_status(context, status_file, "getting credentials from keytab/database");
memset(&conf, 0, sizeof(conf));
if(realm) {
@@ -658,7 +657,7 @@ main(int argc, char **argv)
server_context = (kadm5_server_context *)kadm_handle;
slave_status(context, status_file, "creating log file\n");
slave_status(context, status_file, "creating log file");
ret = kadm5_log_init (server_context);
if (ret)
@@ -682,6 +681,8 @@ main(int argc, char **argv)
10, &backoff);
reconnect = reconnect_min;
slave_status(context, status_file, "ipropd-slave started");
while (!exit_flag) {
time_t now, elapsed;
int connected = FALSE;
@@ -730,7 +731,7 @@ main(int argc, char **argv)
connected = TRUE;
slave_status(context, status_file, "connected to master, waiting instructions\n");
slave_status(context, status_file, "connected to master, waiting instructions");
while (connected && !exit_flag) {
krb5_data out;