X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=d1dcf848444ea9077cee66058ab5158d7a6af0a2;hb=dc887f5011834d5a9a6ec5deb8781c6bfd88c474;hp=a618e63f0d9158f78ba813b0efbb660599da8684;hpb=a08462bf845973016e061b8ca1233142d80416f6;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index a618e63f..d1dcf848 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -203,6 +203,8 @@ static bool parse_options(int argc, char **argv) {
 						kill_tincd = SIGINT;
 					else if(!strcasecmp(optarg, "ALRM"))
 						kill_tincd = SIGALRM;
+					else if(!strcasecmp(optarg, "ABRT"))
+						kill_tincd = SIGABRT;
 					else {
 						kill_tincd = atoi(optarg);
 
@@ -221,7 +223,9 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 'n':				/* net name given */
-				netname = xstrdup(optarg);
+				/* netname "." is special: a "top-level name" */
+				netname = strcmp(optarg, ".") != 0 ?
+						xstrdup(optarg) : NULL;
 				break;
 
 			case 'o':				/* option */
@@ -500,12 +504,12 @@ static bool drop_privs() {
 }
 
 #ifdef HAVE_MINGW
-# define setpriority(level) SetPriorityClass(GetCurrentProcess(), level)
+# define setpriority(level) SetPriorityClass(GetCurrentProcess(), (level))
 #else
 # define NORMAL_PRIORITY_CLASS 0
 # define BELOW_NORMAL_PRIORITY_CLASS 10
 # define HIGH_PRIORITY_CLASS -10
-# define setpriority(level) nice(level)
+# define setpriority(level) (setpriority(PRIO_PROCESS, 0, (level)))
 #endif
 
 int main(int argc, char **argv) {