Merge lp:~hingo/drizzle/drizzle-rescue-drizzle_password_hash into lp:~drizzle-trunk/drizzle/development

[Henrik Ingo]

With the recent rehash of libdrizzle files, one binary called drizzle_password_hash dropped out of make install. This is referenced in the auth_ldap documentation and use for password management with ldap.

This fixes the problem by moving the source file to client/drizzle_password_hash.cc and adding to bin_PROGRAMS in client/include.am. The libdrizzle*/mysql_password_hash.cc files are deleted.

=== modified file '.bzrignore'
--- .bzrignore	2011-12-27 16:09:18 +0000
+++ .bzrignore	2012-01-13 10:33:24 +0000
@@ -43,6 +43,7 @@
 client/drizzleslap
 client/drizzletest
 client/mysqlslap
+client/drizzle_password_hash
 comp_creator.gcno
 compile
 config.guess
@@ -166,8 +167,6 @@
 item.gcno
 key.gcno
 key_map.gcno
-libdrizzle-2.0/libdrizzle/mysql_password_hash
-libdrizzle-2.0/libdrizzle/drizzle_password_hash
 libmysql/Makefile.in
 libserialutil_la-db.gcno
 libserialutil_la-unireg.gcno
 
=== renamed file 'libdrizzle/mysql_password_hash.cc' => 'client/drizzle_password_hash.cc'
=== modified file 'client/include.am'
--- client/include.am	2011-11-30 17:23:18 +0000
+++ client/include.am	2012-01-13 10:33:24 +0000
@@ -34,7 +34,8 @@
 	       client/drizzle \
 	       client/drizzledump \
 	       client/drizzleimport \
-	       client/drizzleslap
+	       client/drizzleslap \
+	       client/drizzle_password_hash
 
 man_MANS+= \
 	   client/drizzle.1 \
@@ -88,3 +89,7 @@
 
 client_drizzletest_SOURCES=	client/drizzletest.cc
 client_drizzletest_LDADD=	${CLIENT2_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
+
+
+client_drizzle_password_hash_SOURCES= client/drizzle_password_hash.cc
+client_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
 
=== modified file 'libdrizzle-2.0/include.am'
--- libdrizzle-2.0/include.am	2011-12-23 20:13:32 +0000
+++ libdrizzle-2.0/include.am	2012-01-13 10:33:24 +0000
@@ -40,18 +40,6 @@
 SQLITE_PROGS= examples/sqlite_server
 endif
 
-noinst_PROGRAMS+= libdrizzle-2.0/mysql_password_hash
-libdrizzle_2_0_mysql_password_hash_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
-libdrizzle_2_0_mysql_password_hash_SOURCES= libdrizzle-2.0/mysql_password_hash.cc
-
-# For some reason this has originally been called mysql_password_hash. I'd prefer
-# to call it drizzle_password_hash but to remain backward compatible I didn't
-# change any sources, rather just build it twice and provide both.
-# Only drizzle_password_hash is installed by make install though.
-noinst_PROGRAMS+= libdrizzle-2.0/drizzle_password_hash
-libdrizzle_2_0_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
-libdrizzle_2_0_drizzle_password_hash_SOURCES= libdrizzle-2.0/mysql_password_hash.cc
-
 noinst_PROGRAMS+= \
 		  $(SQLITE_PROGS) \
 		  examples/client \
@@ -59,8 +47,7 @@
 		  examples/proxy \
 		  examples/server \
 		  examples/simple \
-		  examples/simple_multi \
-		  libdrizzle-2.0/mysql_password_hash
+		  examples/simple_multi
 
 libdrizzle_2_0_libdrizzle_2_0_la_CXXFLAGS= \
 					   ${AM_CXXFLAGS} \
 
=== removed file 'libdrizzle-2.0/mysql_password_hash.cc'
--- libdrizzle-2.0/mysql_password_hash.cc	2011-11-04 21:06:16 +0000
+++ libdrizzle-2.0/mysql_password_hash.cc	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Drizzle Client & Protocol Library
- *
- * Copyright (C) 2008 Eric Day ([e-mail])
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- *     * The names of its contributors may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-
-#include <config.h>
-
-#include <cstring>
-#include <iostream>
-
-#include <libdrizzle-2.0/drizzle_client.h>
-
-static const uint32_t BUFFER_CHUNK= 8192;
-
-int main(int argc, char *argv[])
-{
-  char hashed_password[DRIZZLE_MYSQL_PASSWORD_HASH];
-
-  if (argc != 2)
-  {
-    std::cerr << "Usage: " << argv[0] << " <password to hash>" << std::endl;
-    return 1;
-  }
-
-  drizzle_mysql_password_hash(hashed_password, argv[1], strlen(argv[1]));
-
-  std::cout << hashed_password << std::endl;
-
-  return 0;
-}