svn commit: r1422415 - in /apr/apr-util/branches/1.5.x: ./ CHANGES crypto/apr_passwd.c

[sf...@apache.org]

Author: sf
Date: Sat Dec 15 23:25:55 2012
New Revision: 1422415

URL: http://svn.apache.org/viewvc?rev=1422415&view=rev
Log:
Merge 1422413, add CHANGES:

    Split glibc version detection in two #if directives.
    If __GLIBC_PREREQ is undefined, the single-line version expands to
    '#if 0 && 0(2,4)', which causes a syntax error.

    PR: 54275


Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/crypto/apr_passwd.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1422413

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1422415&r1=1422414&r2=1422415&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Sat Dec 15 23:25:55 2012
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.2
 
+  *) Fix syntax error in crypto/apr_passwd.c on non-glibc systems. PR 54275.
+     [Stefan Fritsch]
+
   *) Fix potential data corruption in apr_brigade_write() and friends if
      the last bucket of the brigade is a heap bucket that has been split,
      and there are still references to the next part of the original bucket

Modified: apr/apr-util/branches/1.5.x/crypto/apr_passwd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_passwd.c?rev=1422415&r1=1422414&r2=1422415&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_passwd.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_passwd.c Sat Dec 15 23:25:55 2012
@@ -111,7 +111,8 @@ APU_DECLARE(apr_status_t) apr_password_v
 #elif defined(CRYPT_R_STRUCT_CRYPT_DATA)
         struct crypt_data buffer;
 
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,4)
+#ifdef __GLIBC_PREREQ
+#if __GLIBC_PREREQ(2,4)
         buffer.initialized = 0;
 #else
         /*
@@ -120,6 +121,8 @@ APU_DECLARE(apr_status_t) apr_password_v
          */
         memset(&buffer, 0, sizeof(buffer));
 #endif
+#endif /* defined __GLIBC_PREREQ */
+
         crypt_pw = crypt_r(passwd, hash, &buffer);
         if (!crypt_pw) {
             return APR_EMISMATCH;