From: ian <ian>
Date: Sun, 10 Dec 2000 22:00:20 +0000 (+0000)
Subject: @@ -1,3 +1,9 @@
X-Git-Tag: branchpoint-2000-12-10-udptunnelconf^0
X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/commitdiff_plain/87a7ced4ae2d3da3579931ab784577c7fb5c134e

@@ -1,3 +1,9 @@
+userv-utils (0.2.1) unstable; urgency=low
+
+  * service.c (userv ipif) /32 prefixes work properly now.
+
+ --
+
 userv-utils (0.2.0) unstable; urgency=low

   Improvements to ipif (tunnelling/VPN facility):
---

diff --git a/changelog b/changelog
index 1ced792..b834e3d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+userv-utils (0.2.1) unstable; urgency=low
+
+  * service.c (userv ipif) /32 prefixes work properly now.
+
+ --
+
 userv-utils (0.2.0) unstable; urgency=low
 
   Improvements to ipif (tunnelling/VPN facility):
diff --git a/ipif/service.c b/ipif/service.c
index c37ce58..140a7c8 100644
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -100,7 +100,7 @@
  * along with userv-utils; if not, write to the Free Software
  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: service.c,v 1.13 2000/09/18 00:31:11 ian Exp $
+ * $Id: service.c,v 1.14 2000/12/10 22:00:21 ian Exp $
  */
 
 #include <stdio.h>
@@ -329,7 +329,7 @@ static void eat_prefixmask(const char **argp, const char *what,
   sprintf(whatbuf,"%s length",what);
   len= eat_number(argp,whatbuf, 0,32, endchars,endchar_r);
 
-  mask= (~0UL << (32-len));
+  mask= len ? (~0UL << (32-len)) : 0UL;
   if (prefix & ~mask) badusage("%s prefix %08lx not fully contained in mask %08lx",
 			       what,prefix,mask);
   *prefix_r= prefix;