bk commit into 4.1 tree (hartmut:1.2420)

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
4.1 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2420 05/09/16 00:15:47 hartmut@stripped +1 -0
  compare host names by address lookup instead of simple string comparison

  ndb/tools/ndb_config.cpp
    1.7 05/09/16 00:15:33 hartmut@stripped +45 -3
    compare host names by address lookup instead of simple string comparison

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/4.1

--- 1.6/ndb/tools/ndb_config.cpp	2005-09-05 16:33:37 +02:00
+++ 1.7/ndb/tools/ndb_config.cpp	2005-09-16 00:15:33 +02:00
@@ -23,6 +23,8 @@
 #include <my_getopt.h>
 #include <mysql_version.h>
 
+#include <netdb.h>
+
 #include <NdbOut.hpp>
 #include <mgmapi.h>
 #include <mgmapi_configuration.hpp>
@@ -127,6 +129,11 @@
   virtual int eval(NdbMgmHandle, const Iter&);
 };
 
+struct HostMatch : public Match
+{
+  virtual int eval(NdbMgmHandle, const Iter&);
+};
+
 struct Apply
 {
   Apply() {}
@@ -297,9 +304,10 @@
   Match m;
   if(g_host)
   {
-    m.m_key = CFG_NODE_HOST;
-    m.m_value.assfmt("%s", g_host);
-    where.push_back(new Match(m));
+    HostMatch *m = new HostMatch;
+    m->m_key = CFG_NODE_HOST;
+    m->m_value.assfmt("%s", g_host);
+    where.push_back(m);
   }
   
   if(g_type)
@@ -373,6 +381,40 @@
     return 0;
   }
   return 1;
+}
+
+int
+HostMatch::eval(NdbMgmHandle h, const Iter& iter)
+{
+  const char* valc;
+  
+  if(iter.get(m_key, &valc) == 0)
+  {
+	  struct hostent *h1, *h2;
+
+	  h1 = gethostbyname(m_value.c_str());
+	  if (h1 == NULL) {
+		  return 0;
+	  }
+
+	  h2 = gethostbyname(valc);
+	  if (h2 == NULL) {
+		  return 0;
+	  }
+
+	  if (h1->h_addrtype != h2->h_addrtype) {
+		  return 0;
+	  }
+
+	  if (h1->h_length != h2->h_length) 
+	  {
+		  return 0;
+	  }
+	  
+	  return 0 == memcmp(h1->h_addr, h2->h_addr, h1->h_length);
+  }
+
+  return 0;
 }
 
 int