1
0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00

Initialise socket_path before parsing configuration file.

This commit is contained in:
Nicholas Marriott 2009-03-04 17:33:30 +00:00
parent 65b9aeb337
commit a9a22d7ede

View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.124 2009-02-21 17:52:25 nicm Exp $ */ /* $Id: server.c,v 1.125 2009-03-04 17:33:30 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -163,6 +163,9 @@ server_start(const char *path)
server_password = NULL; server_password = NULL;
server_activity = time(NULL); server_activity = time(NULL);
start_time = time(NULL);
socket_path = path;
if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0) { if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0) {
log_warnx("%s", cause); log_warnx("%s", cause);
exit(1); exit(1);
@ -173,8 +176,6 @@ server_start(const char *path)
setproctitle("server (%s)", path); setproctitle("server (%s)", path);
#endif #endif
log_debug("server started, pid %ld", (long) getpid()); log_debug("server started, pid %ld", (long) getpid());
start_time = time(NULL);
socket_path = path;
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
sa.sun_family = AF_UNIX; sa.sun_family = AF_UNIX;