From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 20 Aug 2011 16:24:02 +0000 (+0100)
Subject: Merge branch 'zealot'
X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/commitdiff_plain/8acaed657eb4db47c448c8a582810bf301ff47ef?hp=0ae8e6867facf7eb8055533a642026d7c9e9cf38

Merge branch 'zealot'

Conflicts:
	.gitignore
	ipif/Makefile
---

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b8228f6..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-dist_tmp
-userv-utils-*.tar.gz
-build
diff --git a/debian/.cvsignore b/debian/.cvsignore
deleted file mode 100644
index 1e64510..0000000
--- a/debian/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sv-*
-tmp
-files
diff --git a/finger/.cvsignore b/finger/.gitignore
similarity index 100%
rename from finger/.cvsignore
rename to finger/.gitignore
diff --git a/ipif/.cvsignore b/ipif/.cvsignore
deleted file mode 100644
index d9a8d7c..0000000
--- a/ipif/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-service
-automech.[ch]
-udptunnel-forwarder
-udptunnel-reconf
-blowfishtest
diff --git a/ipif/forwarder.c b/ipif/forwarder.c
index 66f8690..7a81403 100644
--- a/ipif/forwarder.c
+++ b/ipif/forwarder.c
@@ -84,7 +84,7 @@ static int n_mechs;
 static const struct mechanism *mechs[MAXMECHS];
 
 static struct mechdata *md_in[MAXMECHS], *md_out[MAXMECHS];
-static size_t maxprefix, maxsuffix;
+static int maxprefix, maxsuffix;
 
 static struct buffer buf_in, buf_out;
 static unsigned char *accum_buf;
@@ -183,7 +183,8 @@ static void inbound(void) {
   static unsigned long npackets, nbytes;
   
   struct sockaddr_in this_saddr;
-  int r, i, different, this_saddrlen;
+  size_t this_saddrlen;
+  int r, i, different;
   const char *emsg;
 
   buf_in.start= buf_in.base+1;
@@ -429,7 +430,8 @@ int main(int argc, const char *const *const argv_in) {
 
     if (keepalive) {
       tnow= now();
-      if (tnow >= nextsendka && public_remote_specd) sendpacket("\300",1);
+      if (tnow >= nextsendka && public_remote_specd)
+	sendpacket((unsigned char*)"\300",1);
       polltimeout= (nextsendka - tnow)*1000;
     } else {
       polltimeout= -1;
diff --git a/www-cgi/.cvsignore b/www-cgi/.cvsignore
deleted file mode 100644
index 79f731a..0000000
--- a/www-cgi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-ucgi
-ucgitarget