projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Solaris compile fixes
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
5748224
..
d951224
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: tincd.c,v 1.10.4.4
3 2001/02/25 14:51:42
guus Exp $
+ $Id: tincd.c,v 1.10.4.4
7 2001/06/05 16:09:55
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-88,9
+88,6
@@
static int show_version;
/* If nonzero, it will attempt to kill a running tincd and exit. */
static int kill_tincd = 0;
/* If nonzero, it will attempt to kill a running tincd and exit. */
static int kill_tincd = 0;
-/* If zero, don't detach from the terminal. */
-extern int do_detach;
-
/* If nonzero, generate public/private keypair for this host/net. */
static int generate_keys = 0;
/* If nonzero, generate public/private keypair for this host/net. */
static int generate_keys = 0;
@@
-246,7
+243,7
@@
int keygen(int bits)
if(config && (cfg = get_config_val(config, config_name)))
asprintf(&filename, "%s/hosts/%s", confbase, cfg->data.ptr);
else
if(config && (cfg = get_config_val(config, config_name)))
asprintf(&filename, "%s/hosts/%s", confbase, cfg->data.ptr);
else
- asprintf(&filename, "%s/rsa_key.priv");
+ asprintf(&filename, "%s/rsa_key.priv"
, confbase
);
if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
return -1;
if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
return -1;
@@
-308,10
+305,6
@@
main(int argc, char **argv, char **envp)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- /* Do some intl stuff right now */
-
- unknown = _("unknown");
-
environment = envp;
parse_options(argc, argv, envp);
environment = envp;
parse_options(argc, argv, envp);
@@
-336,7
+329,11
@@
main(int argc, char **argv, char **envp)
return 1;
}
return 1;
}
- openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#ifdef HAVE_SOLARIS
+ openlog("tinc", LOG_CONS, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#else
+ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#endif
g_argv = argv;
g_argv = argv;
@@
-356,7
+353,7
@@
cp
exit(kill_other());
if(read_server_config())
exit(kill_other());
if(read_server_config())
-
return 1
;
+
exit(1)
;
cp
if(detach())
exit(0);
cp
if(detach())
exit(0);
@@
-383,8
+380,7
@@
cp
else
{
syslog(LOG_ERR, _("Not restarting."));
else
{
syslog(LOG_ERR, _("Not restarting."));
- exit(
0
);
+ exit(
1
);
}
}
}
}
}
}
-