Merge lp:~linuxjedi/drizzle/elliott-bug-743902 into lp:drizzle/7.0

[Andrew Hutchings]

Backport bug fix from trunk

[Stewart Smith (stewart)]

looks good

review: Approve

[Andrew Hutchings (linuxjedi)]

Valgrind warnings need fixing here too

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2011-03-14 11:43:13 +0000
+++ client/drizzle.cc	2011-04-19 18:13:25 +0000
@@ -154,6 +154,8 @@
 #include <boost/scoped_ptr.hpp>
 #include <drizzled/program_options/config_file.h>
 
+#include "user_detect.h"
+
 using namespace std;
 namespace po=boost::program_options;
 namespace dpo=drizzled::program_options;
@@ -1474,7 +1476,8 @@
   _("Automatic limit for rows in a join when using --safe-updates"))
   ;
 #ifndef DRIZZLE_ADMIN_TOOL
-  const char* unix_user= getlogin();
+  UserDetect *detected_user= new UserDetect();
+  const char* shell_user= detected_user->getUser();
 #endif
   po::options_description client_options(_("Options specific to the client"));
   client_options.add_options()
@@ -1487,7 +1490,7 @@
 #ifdef DRIZZLE_ADMIN_TOOL
   ("user,u", po::value<string>(&current_user)->default_value("root"),
 #else
-  ("user,u", po::value<string>(&current_user)->default_value((unix_user ? unix_user : "")),
+  ("user,u", po::value<string>(&current_user)->default_value(shell_user ? shell_user : ""),
 #endif
   _("User for login if not current user."))
   ("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),
 
=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2011-03-04 23:41:25 +0000
+++ client/drizzledump.cc	2011-04-19 18:13:25 +0000
@@ -48,6 +48,8 @@
 #include "drizzledump_mysql.h"
 #include "drizzledump_drizzle.h"
 
+#include "user_detect.h"
+
 using namespace std;
 using namespace drizzled;
 namespace po= boost::program_options;
@@ -533,7 +535,8 @@
   _("Do not make a UTF8 connection to MySQL, use if you have UTF8 data in a non-UTF8 table"))
   ;
 
-  const char* unix_user= getlogin();
+  UserDetect *detected_user= new UserDetect();
+  const char* shell_user= detected_user->getUser();
 
   po::options_description client_options(_("Options specific to the client"));
   client_options.add_options()
@@ -543,7 +546,7 @@
   _("Password to use when connecting to server. If password is not given it's solicited on the tty."))
   ("port,p", po::value<uint32_t>(&opt_drizzle_port)->default_value(0),
   _("Port number to use for connection."))
-  ("user,u", po::value<string>(&current_user)->default_value((unix_user ? unix_user : "")),
+  ("user,u", po::value<string>(&current_user)->default_value((shell_user ? shell_user : "")),
   _("User for login if not current user."))
   ("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),
   _("The protocol of connection (mysql or drizzle)."))
 
=== modified file 'client/drizzleimport.cc'
--- client/drizzleimport.cc	2011-03-03 22:12:08 +0000
+++ client/drizzleimport.cc	2011-04-19 18:13:25 +0000
@@ -31,6 +31,8 @@
 #include <drizzled/gettext.h>
 #include <drizzled/configmake.h>
 
+#include "user_detect.h"
+
 namespace po= boost::program_options;
 using namespace std;
 using namespace drizzled;
@@ -397,7 +399,8 @@
   "Load files in parallel. The argument is the number of threads to use for loading data (default is 4.")
   ;
 
-  const char* unix_user= getlogin();
+  UserDetect *detected_user= new UserDetect();
+  const char* shell_user= detected_user->getUser();
 
   po::options_description client_options("Options specific to the client");
   client_options.add_options()
@@ -409,7 +412,7 @@
   "Port number to use for connection") 
   ("protocol", po::value<string>(&opt_protocol)->default_value("mysql"),
   "The protocol of connection (mysql or drizzle).")
-  ("user,u", po::value<string>(&current_user)->default_value((unix_user ? unix_user : "")),
+  ("user,u", po::value<string>(&current_user)->default_value((shell_user ? shell_user : "")),
   "User for login if not current user.")
   ;
 
 
=== modified file 'client/include.am'
--- client/include.am	2011-02-21 13:59:06 +0000
+++ client/include.am	2011-04-19 18:13:25 +0000
@@ -58,6 +58,7 @@
                  client/statement.h \
                  client/stats.h \
                  client/thread_context.h \
+                 client/user_detect.h \
                  client/wakeup.h
 
 client_drizzle_SOURCES=		client/drizzle.cc client/linebuffer.cc
 
=== added file 'client/user_detect.h'
--- client/user_detect.h	1970-01-01 00:00:00 +0000
+++ client/user_detect.h	2011-04-19 18:13:25 +0000
@@ -0,0 +1,62 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2011 Andrew Hutchings
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef CLIENT_USER_DETECT_H
+#define CLIENT_USER_DETECT_H
+
+#include <unistd.h>
+#include <pwd.h>
+#include <cstring>
+
+class UserDetect
+{
+  public:
+    const char* getUser() { return user; }
+
+    UserDetect() :
+      user(NULL)
+    {
+      long pw_len= sysconf(_SC_GETPW_R_SIZE_MAX);
+      struct passwd pw_struct;
+      struct passwd* pw_tmp_struct;
+      char *pw_buffer= new char[pw_len];
+
+      if (getpwuid_r(geteuid(), &pw_struct, pw_buffer, pw_len, &pw_tmp_struct) != 0)
+      {
+        user= NULL;
+      }
+      else
+      {
+        user= new char[strlen(pw_struct.pw_name)];
+        strcpy(user, pw_struct.pw_name);
+      }
+
+      delete[] pw_buffer;
+    }
+
+    ~UserDetect()
+    {
+      delete[] user;
+    }
+
+  private:
+    char* user;
+};
+
+#endif /* CLIENT_USER_DETECT_H */
 
=== modified file 'plugin/console/console.cc'
--- plugin/console/console.cc	2011-03-14 15:00:51 +0000
+++ plugin/console/console.cc	2011-04-19 18:13:25 +0000
@@ -27,6 +27,8 @@
 
 #include <boost/program_options.hpp>
 
+#include <client/user_detect.h>
+
 using namespace std;
 using namespace drizzled;
 
@@ -386,8 +388,10 @@
   context("debug",
           po::value<bool>(&debug_enabled)->default_value(false)->zero_tokens(),
           N_("Turn on extra debugging."));
+  UserDetect *detected_user= new UserDetect();
+  const char* shell_user= detected_user->getUser();
   context("username",
-          po::value<string>(),
+          po::value<string>()->default_value(shell_user ? shell_user : ""),
           N_("User to use for auth."));
   context("password",
           po::value<string>(),