From: Nirbhay Choubey
Date: April 30 2011 5:39am
Subject: bzr push into mysql-5.5 branch (nirbhay.choubey:3482 to 3483) Bug#11757855
List-Archive: http://lists.mysql.com/commits/136458
X-Bug: 11757855
Message-Id: <201104300539.p3U5dh6w011015@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2012714547=="

--===============2012714547==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3483 Nirbhay Choubey	2011-04-30 [merge]
      Merge of fix for bug#11757855 from mysql-5.1 -> mysql-5.5.

    modified:
      cmake/os/WindowsCache.cmake
      cmd-line-utils/libedit/el.c
      config.h.cmake
      configure.cmake
 3482 Davi Arnaut	2011-04-29
      FIONREAD is located in sys/filio.h on Solaris.

    modified:
      config.h.cmake
      configure.cmake
      vio/viosocket.c
=== modified file 'cmake/os/WindowsCache.cmake'
--- a/cmake/os/WindowsCache.cmake	2011-04-13 19:05:26 +0000
+++ b/cmake/os/WindowsCache.cmake	2011-04-30 05:24:38 +0000
@@ -101,6 +101,10 @@ SET(HAVE_IPV6_V6ONLY 1 CACHE  INTERNAL "
 SET(HAVE_ISINF CACHE  INTERNAL "")
 SET(HAVE_ISNAN CACHE  INTERNAL "")
 SET(HAVE_ISSETUGID CACHE  INTERNAL "")
+SET(HAVE_GETUID CACHE  INTERNAL "")
+SET(HAVE_GETEUID CACHE  INTERNAL "")
+SET(HAVE_GETGID CACHE  INTERNAL "")
+SET(HAVE_GETEGID CACHE  INTERNAL "")
 SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")

=== modified file 'cmd-line-utils/libedit/el.c'
--- a/cmd-line-utils/libedit/el.c	2009-06-11 16:21:32 +0000
+++ b/cmd-line-utils/libedit/el.c	2011-04-29 13:22:46 +0000
@@ -478,7 +478,13 @@ el_source(EditLine *el, const char *fnam
 
 	fp = NULL;
 	if (fname == NULL) {
-#ifdef HAVE_ISSETUGID
+/* XXXMYSQL: Bug#49967 */
+#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) && \
+    defined(HAVE_GETGID) && defined(HAVE_GETEGID)
+#define HAVE_IDENTITY_FUNCS 1
+#endif
+
+#if (defined(HAVE_ISSETUGID) || defined(HAVE_IDENTITY_FUNCS))
 		static const char elpath[] = "/.editrc";
 /* XXXMYSQL: Portability fix (for which platforms?) */
 #ifdef MAXPATHLEN
@@ -486,9 +492,13 @@ el_source(EditLine *el, const char *fnam
 #else
 		char path[4096];
 #endif
-
+#ifdef HAVE_ISSETUGID
 		if (issetugid())
 			return (-1);
+#elif defined(HAVE_IDENTITY_FUNCS)
+                if (getuid() != geteuid() || getgid() != getegid())
+                  return (-1);
+#endif
 		if ((ptr = getenv("HOME")) == NULL)
 			return (-1);
 		if (strlcpy(path, ptr, sizeof(path)) >= sizeof(path))
@@ -498,9 +508,10 @@ el_source(EditLine *el, const char *fnam
 		fname = path;
 #else
 		/*
-		 * If issetugid() is missing, always return an error, in order
-		 * to keep from inadvertently opening up the user to a security
-		 * hole.
+		 * If issetugid() or the above mentioned get[e][u|g]id()
+		 * functions are missing, always return an error, in order
+		 * to keep from inadvertently opening up the user to a
+		 * security hole.
 		 */
 		return (-1);
 #endif

=== modified file 'config.h.cmake'
--- a/config.h.cmake	2011-04-29 21:48:23 +0000
+++ b/config.h.cmake	2011-04-30 05:24:38 +0000
@@ -174,6 +174,10 @@
 #cmakedefine gmtime_r @gmtime_r@
 #cmakedefine HAVE_INITGROUPS 1
 #cmakedefine HAVE_ISSETUGID 1
+#cmakedefine HAVE_GETUID 1
+#cmakedefine HAVE_GETEUID 1
+#cmakedefine HAVE_GETGID 1
+#cmakedefine HAVE_GETEGID 1
 #cmakedefine HAVE_ISNAN 1
 #cmakedefine HAVE_ISINF 1
 #cmakedefine HAVE_LARGE_PAGE_OPTION 1

=== modified file 'configure.cmake'
--- a/configure.cmake	2011-04-29 21:48:23 +0000
+++ b/configure.cmake	2011-04-30 05:24:38 +0000
@@ -362,6 +362,10 @@ CHECK_FUNCTION_EXISTS (getwd HAVE_GETWD)
 CHECK_FUNCTION_EXISTS (gmtime_r HAVE_GMTIME_R)
 CHECK_FUNCTION_EXISTS (initgroups HAVE_INITGROUPS)
 CHECK_FUNCTION_EXISTS (issetugid HAVE_ISSETUGID)
+CHECK_FUNCTION_EXISTS (getuid HAVE_GETUID)
+CHECK_FUNCTION_EXISTS (geteuid HAVE_GETEUID)
+CHECK_FUNCTION_EXISTS (getgid HAVE_GETGID)
+CHECK_FUNCTION_EXISTS (getegid HAVE_GETEGID)
 CHECK_FUNCTION_EXISTS (ldiv HAVE_LDIV)
 CHECK_FUNCTION_EXISTS (localtime_r HAVE_LOCALTIME_R)
 CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)


--===============2012714547==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/nirbhay.choubey@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nirbhay.choubey@stripped\
#   6takbd804ughjhhg
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# testament_sha1: 57ec9588a5a63f0255c8579cf6a218b01aaf3308
# timestamp: 2011-04-30 11:09:29 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.1.49967/
# base_revision_id: davi.arnaut@stripped\
#   6xuzp8ebb45uvjxy
# 
# Begin bundle
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
2wnwN+AyszMYkoUqLr5yUxn/F3JFOFCQiB4aXw==


--===============2012714547==--