Don't test HAVE_DAEMON since roken supplies it.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15213 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -605,9 +605,7 @@ static char *keytab_str = "HDB:";
|
||||
static char *database;
|
||||
static char *config_file;
|
||||
static char *port_str;
|
||||
#ifdef HAVE_DAEMON
|
||||
static int detach_from_console = 0;
|
||||
#endif
|
||||
|
||||
static struct getargs args[] = {
|
||||
{ "config-file", 'c', arg_string, &config_file },
|
||||
@@ -622,11 +620,9 @@ static struct getargs args[] = {
|
||||
{ "time-gone", 0, arg_string, &slave_time_gone,
|
||||
"time of inactivity after which a slave is considered gone", "time"},
|
||||
{ "port", 0, arg_string, &port_str,
|
||||
"port ipropd will listen too", "port"},
|
||||
#ifdef HAVE_DAEMON
|
||||
"port ipropd will listen to", "port"},
|
||||
{ "detach", 0, arg_flag, &detach_from_console,
|
||||
"detach from console" },
|
||||
#endif
|
||||
{ "version", 0, arg_flag, &version_flag },
|
||||
{ "help", 0, arg_flag, &help_flag }
|
||||
};
|
||||
@@ -676,10 +672,8 @@ main(int argc, char **argv)
|
||||
if (time_before_missing < 0)
|
||||
krb5_errx (context, 1, "couldn't parse time: %s", slave_time_missing);
|
||||
|
||||
#ifdef HAVE_DAEMON
|
||||
if (detach_from_console)
|
||||
daemon(0, 0);
|
||||
#endif
|
||||
pidfile (NULL);
|
||||
krb5_openlog (context, "ipropd-master", &log_facility);
|
||||
krb5_set_warn_dest(context, log_facility);
|
||||
|
Reference in New Issue
Block a user