From: Nirbhay Choubey Date: April 30 2011 5:40am Subject: bzr push into mysql-trunk-wl5378 branch (nirbhay.choubey:3348 to 3349) Bug#11757855 List-Archive: http://lists.mysql.com/commits/136459 X-Bug: 11757855 Message-Id: <201104300540.p3U5ejru011461@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1282880169==" --===============1282880169== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3349 Nirbhay Choubey 2011-04-30 [merge] Merge of fix for bug#11757855 from mysql-5.5 -> mysql-trunk. modified: cmake/os/WindowsCache.cmake cmd-line-utils/libedit/el.c config.h.cmake configure.cmake 3348 Marc Alff 2011-04-29 Re branched tree for WL#5378 modified: .bzr-mysql/default.conf === modified file 'cmake/os/WindowsCache.cmake' --- a/cmake/os/WindowsCache.cmake 2011-04-13 19:16:45 +0000 +++ b/cmake/os/WindowsCache.cmake 2011-04-30 05:36:44 +0000 @@ -104,6 +104,10 @@ ENDIF() 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:53:46 +0000 +++ b/config.h.cmake 2011-04-30 05:36:44 +0000 @@ -173,6 +173,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:53:46 +0000 +++ b/configure.cmake 2011-04-30 05:36:44 +0000 @@ -353,6 +353,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) --===============1282880169== 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\ # jska5zi39lf1dv1f # target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\ # trunk/ # testament_sha1: 75e24a8f27e5e489316592097ceea19605140c4c # timestamp: 2011-04-30 11:10:30 +0530 # source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\ # 5.5/ # base_revision_id: marc.alff@stripped\ # jyyjv5ijzc7mz8he # # Begin bundle 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 woSFIoAQ0A== --===============1282880169==--