From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Jan 2013 13:48:28 +0000 (+0000)
Subject: Merge branch 'master' of login.chiark.greenend.org.uk:/home/ian/public-git/userv... 
X-Git-Tag: userv/0.6.1~75
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=693663c6262cbc89bc86374231b519c5d176970a;hp=d6334b2883619614ed7350bf7faf621033911198;p=userv-utils.git

Merge branch 'master' of login.chiark.greenend.org.uk:/home/ian/public-git/userv-utils
---

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/ipif/service.c b/ipif/service.c
index 87dac8e..b9e40e2 100644
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -32,9 +32,9 @@
  *
  *  <local-addr>,<peer-addr>,<mtu>,<proto>
  *
- *      As for slattach.  Supported protocols are slip, cslip, and
- *      adaptive.  Alternatively, set to `debug' to print debugging info
- *      and exit.  <local-addr> is address of the interface to be created
+ *      As for slattach.  The only supported protocol is slip.
+ *      Alternatively, set to `debug' to print debugging info and
+ *      exit.  <local-addr> is address of the interface to be created
  *      on the local system; <peer-addr> is the address of the
  *      point-to-point peer.  They must be actual addresses (not
  *      hostnames).
@@ -48,9 +48,9 @@
  *      not supported).  If no additional routes are to be set up, use `-'
  *      or supply an empty argument.
  *
- * Each <config> item - whether a line file such as
- * /etc/userv/ipif-networks, or supplied on the service program
- * command line - is one of:
+ * Each <config> item - whether a line in a file such as
+ * /etc/userv/ipif-networks, or the single trusted argument supplied
+ * on the service program command line - is one of:
  *
  *   /<config-file-name>
  *   ./<config-file-name>
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