X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=2e1a24af6e218305f62ce4667f60fa97ced929b3;hp=51b1cd7a3158677a13d43e8c344ac78aabad0a81;hb=edd6734faa37d043b8a2cc75b125db3b1c2130fa;hpb=0a3c8cefd4a154948799baaaa246cf0eba050eff

diff --git a/src/subnet.c b/src/subnet.c
index 51b1cd7a..2e1a24af 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: subnet.c,v 1.1.2.19 2001/06/01 08:02:09 guus Exp $
+    $Id: subnet.c,v 1.1.2.21 2001/06/05 18:07:14 guus Exp $
 */
 
 #include "config.h"
@@ -244,7 +244,7 @@ cp
                    subnet->net.ipv6.mask.x[7]);
         break;
       default:
-        asprintf(&netstr, _("unknown"));
+        asprintf(&netstr, _("unknown subnet type"));
     }
 cp
   return netstr;
@@ -289,7 +289,7 @@ cp
             /* Otherwise, see if there is a bigger enclosing subnet */
 
             subnet.net.ipv4.mask = p->net.ipv4.mask << 1;
-            subnet.net.ipv4.address &= subnet.net.ipv4.mask;
+            subnet.net.ipv4.address = p->net.ipv4.address & subnet.net.ipv4.mask;
           }
       }
    } while (p);