Fix for netmask('x.x.x.x/0') is 255.255.255.255 instead of 0.0.0.0

This is because (-1) << 32 is -1 (Only intel arc. has been checked)

Oleg Sharoiko

diff --git a/doc/TODO b/doc/TODO
index 0930c695f017b04907a21282f31aa6b5bbc95243..1e6fdaef0d63d36d425f2b374967108fb8b07cc1 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -48,6 +48,7 @@ PARSER
 * redesign INSERT ... SELECT to have two levels of target list
 * -select * from pg_class where oid in (0,-1)
 * have INTERSECT/EXCEPT prevent duplicates unless ALL is specified
+* prevent primary key of nine columns(see TODO.detail/primary)
 
 VIEWS
 

diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 92580cfe965fc77fea35637a7977ee344e064f0d..cb1b9b90bfea4ed3b7e02d2d602c067fdc5df0f2 100644 (file)
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
  *     is for IP V4 CIDR notation, but prepared for V6: just
  *     add the necessary bits where the comments indicate.
  *
- *     $Id: network.c,v 1.15 1999/07/17 20:17:58 momjian Exp $
+ *     $Id: network.c,v 1.16 1999/09/23 17:42:23 momjian Exp $
  *     Jon Postel RIP 16 Oct 1998
  */
 
@@ -448,7 +448,8 @@ network_netmask(inet *ip)
        if (ip_family(ip) == AF_INET)
        {
                /* It's an IP V4 address: */
-               int                     addr = htonl((-1 << (32 - ip_bits(ip))) & 0xffffffff);
+               int     addr = htonl(ip_bits(ip) ?
+                       (-1 << (32 - ip_bits(ip))) & 0xffffffff : 0x00000000);
 
                if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) == NULL)
                        elog(ERROR, "unable to print netmask (%s)", strerror(errno));