tinc/src conf.c,1.9.4.63,1.9.4.64 net.h,1.9.4.61,1.9.4.62 process.c,1.1.2.52,1.1.2.53

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src
In directory humbolt:/tmp/cvs-serv4234/src

Modified Files:
      Tag: CABAL
	conf.c net.h process.c 
Log Message:
More missing IPv6 definitions and autoconf checks to make sure it compiles
under Solaris 2.6.


Index: conf.c
===================================================================
RCS file: /home/CVS/tinc/src/Attic/conf.c,v
retrieving revision 1.9.4.63
retrieving revision 1.9.4.64
diff -u -r1.9.4.63 -r1.9.4.64
--- conf.c	2003/07/06 23:16:28	1.9.4.63
+++ conf.c	2003/07/11 16:12:59	1.9.4.64
@@ -429,16 +429,6 @@
 	return x;
 }
 
-static int isadir(const char *f)
-{
-	struct stat s;
-
-	if(stat(f, &s) < 0)
-		return 0;
-	else
-		return S_ISDIR(s.st_mode);
-}
-
 int is_safe_path(const char *file)
 {
 	char *p;

Index: net.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/net.h,v
retrieving revision 1.9.4.61
retrieving revision 1.9.4.62
diff -u -r1.9.4.61 -r1.9.4.62
--- net.h	2003/07/07 11:11:33	1.9.4.61
+++ net.h	2003/07/11 16:13:00	1.9.4.62
@@ -35,6 +35,8 @@
 #include <inttypes.h>
 #endif
 
+#include "utils.h"
+
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
 #else

Index: process.c
===================================================================
RCS file: /home/CVS/tinc/src/process.c,v
retrieving revision 1.1.2.52
retrieving revision 1.1.2.53
diff -u -r1.1.2.52 -r1.1.2.53
--- process.c	2003/07/06 23:16:28	1.1.2.52
+++ process.c	2003/07/11 16:13:00	1.1.2.53
@@ -287,11 +287,14 @@
 					   name);
 				return -1;
 			}
-		} else {
+		} else if (errno != EINTR) {
 			logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
 				   strerror(errno));
 			return -1;
 		}
+
+		/* Why do we get EINTR? */
+		return 0;
 	}
 
 	/* Child here */

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/