From: Alexander Nozdrin
Date: August 10 2009 12:31pm
Subject: bzr commit into mysql branch (alik:2852) Bug#45584
List-Archive: http://lists.mysql.com/commits/80441
X-Bug: 45584
Message-Id: <20090810123119.580E97FC6B@quad>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_5X5L6VfFG8VuVcDWXAG0Ww)"

--Boundary_(ID_5X5L6VfFG8VuVcDWXAG0Ww)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///mnt/raid/alik/MySQL/bzr/bug38247/azalea-bf-bug45584/ based on revid:alik@stripped

 2852 Alexander Nozdrin	2009-08-10
      Another postfix for Bug#45584: convert value to host-byte-order before
      comparing with the INADDR_LOOPBACK constant.

    modified:
      sql/hostname.cc
      vio/viosocket.c
=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2009-08-10 04:17:39 +0000
+++ b/sql/hostname.cc	2009-08-10 12:31:13 +0000
@@ -223,7 +223,7 @@ static inline bool is_ip_loopback(const 
     {
       /* Check for IPv4 127.0.0.1. */
       struct in_addr *ip4= &((struct sockaddr_in *) ip)->sin_addr;
-      return ip4->s_addr == INADDR_LOOPBACK;
+      return ntohl(ip4->s_addr) == INADDR_LOOPBACK;
     }
 
 #ifdef HAVE_IPV6

=== modified file 'vio/viosocket.c'
--- a/vio/viosocket.c	2009-08-10 04:17:39 +0000
+++ b/vio/viosocket.c	2009-08-10 12:31:13 +0000
@@ -457,7 +457,7 @@ my_bool vio_peer_addr(Vio *vio, char *ip
     vio->remote.ss_family= AF_INET;
     vio->addrLen= sizeof (struct sockaddr_in);
 
-    ip4->s_addr= INADDR_LOOPBACK;
+    ip4->s_addr= htonl(INADDR_LOOPBACK);
 
     /* Initialize ip_buffer and port. */
 


--Boundary_(ID_5X5L6VfFG8VuVcDWXAG0Ww)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alik@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alik@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alik@stripped
# target_branch: file:///mnt/raid/alik/MySQL/bzr/bug38247/azalea-bf-\
#   bug45584/
# testament_sha1: 177555e2057e09d4876bf10bf5df45ff93b2243b
# timestamp: 2009-08-10 16:31:19 +0400
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWapgGhsAAh3fgFAQWWP//34t
0AC////wUATcl4Oh3TnFspo0EkiZCao9T9U/TIaZR6am0k2U2poaHqPRNNASkjSNPUzVPMkmmZoo
eppoAaMag0AOYBNMAmQwABMEwAAAYiTVD0jeqfpR6m1AZGgAZAaaemUaBJEJoCaYmmRpU9o0TFB6
nqZAANNNuAlOfFYENF+LQLMQiUUZJrK08Cc6IcceGUqHoW6C4+sFZzjfCSSMPgi6EUJ0piHdjPVP
Kwp8MuuI1+XvL83N8rGahwzH5YXRijR0ruwx6tT8bia6qOJf0dPpAd1WvSWaTDzZu+3Ck0sSoUdx
WeV8usB0jF91y12GYNEY+CnALhScYJrKyOMxG8NqJAlypmTpVLrqCHMmQoDjDJxgMjmORUSJBDLB
MJRQnJqLETU65liJsutFhWMkMlpGhBAR2vjK7JgPktlMvHN5ke/Wn3HoW42NBkXm8wVIA5UcEyDT
iYORf03lCMDccBy/qUPrMB7lSX3ARkrtT0LC0oK9CB1McvmRUyjib47lEgSO8ckVKiB2D79UHpmK
iZ4zMucORIrikrr+5jT0EegWZJoRUDCMZY7RGz4lZ4O8igh3BQoGJAzMV1Omo4GNpaForLpEuwGo
Ulox4GB/zmBGOzW6mRqeb4e9xjymcJhIlXgG43GFo06CpCmZECos1ImZRTcbgNxErWBeOaG+m9C4
Fl8CwmRKVcRKigkzhG4KQkkWdEO7l2mPyJWS8GO/jxsVJOSO1cRiAyGty8Vl/XoYbCZ+wZgTkOow
qjUEkVebcOkG00PpVp/TcXvP8FMvVVliuKQHP8ZDWxB6wGW8cf7oQOR2VD9n45GcyR9AKPSJKxkO
BjnMelgq6Olj/1Ug4ftTHnA4dWzaKUeBEBaWHqokDaYBiGGvZBOcfTYskFnciT+ihRqGl4xxQYDi
QwNJKMRoEwHwwqNY2/Gt/567yFglrwYkV2bEngWhAKh6hHd0LiPZ6jksQJn9AZm2XhX26muclA57
HiO6yMrSavNK8lYooZy7Uy0O7H9YkYHwTC4lLX3edHINjfipXTsEYOiTm0olBHjTmsFCykkM5UZz
jSUcj/otLkdforW1Sdb1uhs2mHZkVJR64lfrpxLa7vYWEhtJKRNHQ2VnbYOtRI4AaGfTM9gKDqum
AlqlEqt5Iuh+fdCXLigZdSj/IxQe/ndE3emAGxmJTeXBD49iJp699oalJYlz5wHJLZOXPOCy9tRJ
Q4W0SY61ugLw20mq2ffyJn71ZxMF0LCiWQk/EZLiuyxOjXVIahx/KETnjddKfqWMq2EyjyKbo531
x5AEkGUIEUd4FMUYOHlBS3RqSItbOe6xqIojpSEKwXkgRIwOV41lmLLlFM82Ad0y+vSXI5t3sM0E
UseMgPnu9cDeyhss1ZVbXYscPt2niFSmwy5PIb4j5lRzla6rVKD6OUh7nIt9lxZm4WkWxcLUfQSb
yV/lPGl+h8JzJHyCZfaNDB+gTRsfLobOPM8U6jJ6HCgwTRnJCo1LgXw+1cTid1yS+BwY0c0MsQt9
rNmMkFb+vUCr4gaUFtPIZGt7eJioQxmPnpHNSPVSLLl9U+ZqX1yX/i7kinChIVTANDY=


--Boundary_(ID_5X5L6VfFG8VuVcDWXAG0Ww)--