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:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2004 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2005 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -365,9 +365,7 @@ static int version_flag;
|
||||
static int help_flag;
|
||||
static char *keytab_str;
|
||||
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 },
|
||||
@@ -378,10 +376,8 @@ static struct getargs args[] = {
|
||||
"time before server is considered lost", "time" },
|
||||
{ "port", 0, arg_string, &port_str,
|
||||
"port ipropd-slave will connect to", "port"},
|
||||
#ifdef HAVE_DAEMON
|
||||
{ "detach", 0, arg_flag, &detach_from_console,
|
||||
"detach from console" },
|
||||
#endif
|
||||
{ "version", 0, arg_flag, &version_flag },
|
||||
{ "help", 0, arg_flag, &help_flag }
|
||||
};
|
||||
@@ -441,10 +437,8 @@ main(int argc, char **argv)
|
||||
|
||||
master = argv[0];
|
||||
|
||||
#ifdef HAVE_DAEMON
|
||||
if (detach_from_console)
|
||||
daemon(0, 0);
|
||||
#endif
|
||||
pidfile (NULL);
|
||||
krb5_openlog (context, "ipropd-slave", &log_facility);
|
||||
krb5_set_warn_dest(context, log_facility);
|
||||
|
Reference in New Issue
Block a user