incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1303378 - in /incubator/ooo/trunk/main: acinclude.m4 sal/osl/unx/security.c
Date Wed, 21 Mar 2012 12:58:54 GMT
Author: hdu
Date: Wed Mar 21 12:58:54 2012
New Revision: 1303378

URL: http://svn.apache.org/viewvc?rev=1303378&view=rev
Log:
drop support for getspnam_r's ancient API

Modified:
    incubator/ooo/trunk/main/acinclude.m4
    incubator/ooo/trunk/main/sal/osl/unx/security.c

Modified: incubator/ooo/trunk/main/acinclude.m4
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/acinclude.m4?rev=1303378&r1=1303377&r2=1303378&view=diff
==============================================================================
--- incubator/ooo/trunk/main/acinclude.m4 (original)
+++ incubator/ooo/trunk/main/acinclude.m4 Wed Mar 21 12:58:54 2012
@@ -1,123 +1,4 @@
-dnl @synopsis AX_FUNC_WHICH_GETSPNAM_R
-dnl
-dnl Determines which historical variant of the getspnam_r() call
-dnl (taking four or five arguments) is available on the system
-dnl and sets NEW_SHADOW_API=YES if there are five arguments.
-dnl
-dnl Originally named "AX_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
-dnl for AX_FUNC_WHICH_GETSPNAM_R
-dnl
-dnl @author Caolan McNamara <caolan@skynet.ie>
-dnl @author Daniel Richard G. <skunk@iskunk.org>
-dnl @version 2006-05-01
-dnl @license LGPL
-
-AC_DEFUN([AX_FUNC_WHICH_GETSPNAM_R], [
-
-    AC_LANG_PUSH(C)
-    AC_MSG_CHECKING([how many arguments getspnam_r() takes])
-
-    AC_CACHE_VAL(ac_cv_func_which_getspnam_r, [
-
-################################################################
-
-ac_cv_func_which_getspnam_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of getspnam_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-	[[
-	    #include <sys/types.h>
-	    #include <shadow.h>
-	]],
-	[[
-	    const char *name = "myname";
-	    getspnam_r(name) /* ; */
-	]])],
-    ac_cv_func_which_getspnam_r=no)
-
-#
-# FIVE ARGUMENTS
-#
-
-if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-	[[
-	    #include <sys/types.h>
-	    #include <shadow.h>
-	]],
-	[[
-	    char buffer[[]] = { '\0' };
-	    struct spwd spwdStruct;
-	    const char *name = "myname";
-	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer, 0) /* ; */
-	]])],
-    ac_cv_func_which_getspnam_r=five)
-
-fi
-
-#
-# FOUR ARGUMENTS
-#
-
-if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-	[[
-	    #include <sys/types.h>
-	    #include <shadow.h>
-	]],
-	[[
-	    char buffer[[]] = { '\0' };
-	    struct spwd spwdStruct;
-	    const char *name = "myname";
-	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer) /* ; */
-	]])],
-    ac_cv_func_which_getspnam_r=four)
-
-fi
-
-################################################################
-
-]) dnl end AC_CACHE_VAL
-
-case "$ac_cv_func_which_getspnam_r" in
-    five)
-    AC_MSG_RESULT([five])
-    NEW_SHADOW_API=YES
-    ;;
-
-    four)
-    AC_MSG_RESULT([four])
-    ;;
-
-    no)
-    AC_MSG_RESULT([cannot find function declaration in shadow.h])
-    ;;
-
-    unknown)
-    AC_MSG_RESULT([can't tell])
-    ;;
-
-    *)
-    AC_MSG_ERROR([internal error])
-    ;;
-esac
-
-AC_LANG_POP(C)
-
-]) dnl end AC_DEFUN
+dnl @synopsis PKG_CHECK_MODULES_MACHACK
 
 dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra
 dnl argument between the first and second, denoting a program to call instead of

Modified: incubator/ooo/trunk/main/sal/osl/unx/security.c
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/unx/security.c?rev=1303378&r1=1303377&r2=1303378&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/unx/security.c (original)
+++ incubator/ooo/trunk/main/sal/osl/unx/security.c Wed Mar 21 12:58:54 2012
@@ -583,7 +583,7 @@ osl_psz_loginUser(const sal_Char* pszUse
                 char buffer[1024];
                 struct spwd spwdStruct;
                 buffer[0] = '\0';
-#ifndef NEW_SHADOW_API
+#ifdef OLD_SHADOW_API
                 if (getspnam_r(pszUserName, &spwdStruct, buffer, sizeof buffer) != NULL)
 #else
                 if (getspnam_r(pszUserName, &spwdStruct, buffer, sizeof buffer, NULL)
== 0)
@@ -597,7 +597,7 @@ osl_psz_loginUser(const sal_Char* pszUse
                     if (strcmp(spwdStruct.sp_pwdp, cryptPasswd) == 0) {
                         nError = osl_Security_E_None;
                     } else if (getuid() == 0 &&
-#ifndef NEW_SHADOW_API
+#ifdef OLD_SHADOW_API
                                (getspnam_r("root", &spwdStruct, buffer, sizeof buffer)
!= NULL))
 #else
                                (getspnam_r("root", &spwdStruct, buffer, sizeof buffer,
NULL) == 0))



Mime
View raw message