projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup of the byteorder patch
[umurmur.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index b92bc21e58fa2d97a15ce2195a87ad15894e6f6c..bfff28ab0b4696d2d36138aea05796b11c7d736f 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,5
+1,5
@@
-/* Copyright (C) 2009-201
3
, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-201
3
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-201
4
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-201
4
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-54,6
+54,7
@@
#include "client.h"
#include "conf.h"
#include "version.h"
#include "client.h"
#include "conf.h"
#include "version.h"
+#include "config.h"
char system_string[64], version_string[64];
int bindport;
char system_string[64], version_string[64];
int bindport;
@@
-68,7
+69,7
@@
void lockfile(const char *pidfile)
* unmodified if we cannot lock it.
*/
lfp = open(pidfile, O_WRONLY|O_CREAT, 0640);
* unmodified if we cannot lock it.
*/
lfp = open(pidfile, O_WRONLY|O_CREAT, 0640);
-
+
if (lfp < 0)
Log_fatal("Cannot open PID-file %s for writing", pidfile);
if (lfp < 0)
Log_fatal("Cannot open PID-file %s for writing", pidfile);
@@
-152,12
+153,12
@@
static void switch_user(void)
if (setuid(pwd->pw_uid))
Log_fatal("setuid() failed: %s", strerror(errno));
if (setuid(pwd->pw_uid))
Log_fatal("setuid() failed: %s", strerror(errno));
-
+
if (!grp)
grp = getgrgid(gid);
if (!grp)
Log_fatal("getgrgid() failed: %s", strerror(errno));
if (!grp)
grp = getgrgid(gid);
if (!grp)
Log_fatal("getgrgid() failed: %s", strerror(errno));
-
+
Log_info("Switch to user '%s' group '%s'", pwd->pw_name, grp->gr_name);
}
Log_info("Switch to user '%s' group '%s'", pwd->pw_name, grp->gr_name);
}
@@
-178,7
+179,7
@@
void signal_handler(int sig)
void daemonize()
{
int i;
void daemonize()
{
int i;
-
+
if (getppid() == 1)
return; /* already a daemon */
i = fork();
if (getppid() == 1)
return; /* already a daemon */
i = fork();
@@
-188,19
+189,19
@@
void daemonize()
}
if ( i > 0)
exit(0); /* parent exits */
}
if ( i > 0)
exit(0); /* parent exits */
-
+
/* child (daemon) continues */
setsid(); /* obtain a new process group */
for (i = getdtablesize(); i >= 0; --i)
close(i); /* close all descriptors */
/* child (daemon) continues */
setsid(); /* obtain a new process group */
for (i = getdtablesize(); i >= 0; --i)
close(i); /* close all descriptors */
-
+
i = open("/dev/null",O_RDWR);
(void)dup(i);
(void)dup(i);
i = open("/dev/null",O_RDWR);
(void)dup(i);
(void)dup(i);
-
+
umask(027); /* set newly created file permissions */
(void)chdir("/");
umask(027); /* set newly created file permissions */
(void)chdir("/");
-
+
}
#ifdef POSIX_PRIORITY_SCHEDULING
}
#ifdef POSIX_PRIORITY_SCHEDULING
@@
-245,7
+246,7
@@
int main(int argc, char **argv)
char *conffile = NULL, *pidfile = NULL;
int c;
struct utsname utsbuf;
char *conffile = NULL, *pidfile = NULL;
int c;
struct utsname utsbuf;
-
+
/* Arguments */
#ifdef POSIX_PRIORITY_SCHEDULING
while ((c = getopt(argc, argv, "drp:c:a:b:ht")) != EOF) {
/* Arguments */
#ifdef POSIX_PRIORITY_SCHEDULING
while ((c = getopt(argc, argv, "drp:c:a:b:ht")) != EOF) {
@@
-292,12
+293,12
@@
int main(int argc, char **argv)
else
exit(0);
}
else
exit(0);
}
-
+
/* Initialize the config subsystem early;
* switch_user() will need to read some config variables as well as logging.
*/
Conf_init(conffile);
/* Initialize the config subsystem early;
* switch_user() will need to read some config variables as well as logging.
*/
Conf_init(conffile);
-
+
/* Logging to terminal if not daemonizing, otherwise to syslog or log file.
*/
if (!nodaemon) {
/* Logging to terminal if not daemonizing, otherwise to syslog or log file.
*/
if (!nodaemon) {
@@
-311,10
+312,10
@@
int main(int argc, char **argv)
/* Reopen log file. If user switch results in access denied, we catch
* it early.
*/
/* Reopen log file. If user switch results in access denied, we catch
* it early.
*/
- Log_reset();
+ Log_reset();
}
else Log_init(true);
}
else Log_init(true);
-
+
signal(SIGCHLD, SIG_IGN); /* ignore child */
signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
signal(SIGTTOU, SIG_IGN);
signal(SIGCHLD, SIG_IGN); /* ignore child */
signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
signal(SIGTTOU, SIG_IGN);
@@
-322,7
+323,7
@@
int main(int argc, char **argv)
signal(SIGPIPE, SIG_IGN);
signal(SIGHUP, signal_handler); /* catch hangup signal */
signal(SIGTERM, signal_handler); /* catch kill signal */
signal(SIGPIPE, SIG_IGN);
signal(SIGHUP, signal_handler); /* catch hangup signal */
signal(SIGTERM, signal_handler); /* catch kill signal */
-
+
/* Build system string */
if (uname(&utsbuf) == 0) {
snprintf(system_string, 64, "%s %s", utsbuf.sysname, utsbuf.machine);
/* Build system string */
if (uname(&utsbuf) == 0) {
snprintf(system_string, 64, "%s %s", utsbuf.sysname, utsbuf.machine);
@@
-332,7
+333,7
@@
int main(int argc, char **argv)
snprintf(system_string, 64, "unknown unknown");
snprintf(version_string, 64, "unknown");
}
snprintf(system_string, 64, "unknown unknown");
snprintf(version_string, 64, "unknown");
}
-
+
/* Initializing */
SSLi_init();
Chan_init();
/* Initializing */
SSLi_init();
Chan_init();
@@
-343,17
+344,17
@@
int main(int argc, char **argv)
if (realtime)
setscheduler();
#endif
if (realtime)
setscheduler();
#endif
-
+
Server_run();
Server_run();
-
+
Ban_deinit();
SSLi_deinit();
Chan_free();
Log_free();
Conf_deinit();
Ban_deinit();
SSLi_deinit();
Chan_free();
Log_free();
Conf_deinit();
-
+
if (pidfile != NULL)
unlink(pidfile);
if (pidfile != NULL)
unlink(pidfile);
-
+
return 0;
}
return 0;
}