j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Call make_names() before doing anything else.

Browse source
This commit is contained in:
Guus Sliepen 2003-06-11 19:07:56 +00:00
parent 4b0e5a03fe
commit 9e02a3d563
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.67 2003/05/06 23:14:45 guus Exp $ $Id: tincd.c,v 1.10.4.68 2003/06/11 19:07:56 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -65,13 +65,13 @@
#include "system.h" #include "system.h"
/* The name this program was run with. */ /* The name this program was run with. */
char *program_name; char *program_name = NULL;
/* If nonzero, display usage information and exit. */ /* If nonzero, display usage information and exit. */
int show_help; int show_help = 0;
/* If nonzero, print the version on standard output and exit. */ /* If nonzero, print the version on standard output and exit. */
int show_version; int show_version = 0;
/* If nonzero, it will attempt to kill a running tincd and exit. */ /* If nonzero, it will attempt to kill a running tincd and exit. */
int kill_tincd = 0; int kill_tincd = 0;
@ -85,8 +85,8 @@ int bypass_security = 0;
/* If nonzero, disable swapping for this process. */ /* If nonzero, disable swapping for this process. */
int do_mlock = 0; int do_mlock = 0;
char *identname; /* program name for syslog */ char *identname = NULL; /* program name for syslog */
char *pidfilename; /* pid file location */ char *pidfilename = NULL; /* pid file location */
char **g_argv; /* a copy of the cmdline arguments */ char **g_argv; /* a copy of the cmdline arguments */
char **environment; /* A pointer to the environment on char **environment; /* A pointer to the environment on
startup */ startup */
@ -347,6 +347,7 @@ int main(int argc, char **argv, char **envp)
environment = envp; environment = envp;
parse_options(argc, argv, envp); parse_options(argc, argv, envp);
make_names();
if(show_version) { if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
@ -388,7 +389,6 @@ int main(int argc, char **argv, char **envp)
g_argv = argv; g_argv = argv;
make_names();
init_configuration(&config_tree); init_configuration(&config_tree);
/* Slllluuuuuuurrrrp! */ /* Slllluuuuuuurrrrp! */