Imported Upstream version 2.7.3

This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions

View file

@ -1004,9 +1004,6 @@ int main(int argc, char **argv)
/* start server */
server_load();
/* initialize SSL before we drop privileges (we may not be able to read the keyfile as non-root) */
ssl_init();
become_user(new_uid);
if (chdir(statepath)) {
@ -1038,6 +1035,9 @@ int main(int argc, char **argv)
memset(pidfn, 0, sizeof(pidfn));
}
/* initialize SSL (keyfile must be readable by nut user) */
ssl_init();
while (!exit_flag) {
mainloop();
}