Merge branch 'macosx-yosemite' into fix-macosx

GNUmakefile

@@ -60,10 +60,10 @@ else ifeq ($(basename $(basename $(shell uname -r))),13)
 # Mac OS X Mavericks
 FEATURES+=	-DHAVE_PF
 PKG_CPPFLAGS+=	-I./xnu/10.9
-#else ifeq ($(basename $(basename $(shell uname -r))),14)
-# Mac OS X Syrah
-#FEATURES+=	-DHAVE_PF
-#PKG_CPPFLAGS+=	-I./xnu/10.10
+else ifeq ($(basename $(basename $(shell uname -r))),14)
+# Mac OS X Yosemite
+FEATURES+=	-DHAVE_PF
+PKG_CPPFLAGS+=	-I./xnu/10.9
 endif
 endif
 

main.c

@@ -222,7 +222,11 @@ main(int argc, char *argv[])
 
 	argv0 = argv[0];
 	opts = opts_new();
-	natengine = strdup(nat_getdefaultname());
+	if (nat_getdefaultname()) {
+		natengine = strdup(nat_getdefaultname());
+	} else {
+		natengine = NULL;
+	}
 
 	while ((ch = getopt(argc, argv, OPT_g OPT_G OPT_Z
 	                    "k:c:C:K:t:OPs:e:Eu:j:p:l:L:S:dDVh")) != -1) {

opts.c

@@ -186,7 +186,11 @@ proxyspec_parse(int *argc, char **argv[], const char *natengine)
 				if (af == -1) {
 					exit(EXIT_FAILURE);
 				}
-				spec->natengine = strdup(natengine);
+				if (natengine) {
+					spec->natengine = strdup(natengine);
+				} else {
+					spec->natengine = NULL;
+				}
 				state++;
 				break;
 			case 3: