httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject svn commit: r468042 - /httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
Date Thu, 26 Oct 2006 15:39:42 GMT
Author: bnicholes
Date: Thu Oct 26 08:39:41 2006
New Revision: 468042

URL: http://svn.apache.org/viewvc?view=rev&rev=468042
Log:
Move the assignment statements after the #if code to eliminate the C++ style inline variable
declarations

Modified:
    httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c?view=diff&rev=468042&r1=468041&r2=468042
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c Thu Oct 26 08:39:41 2006
@@ -127,8 +127,6 @@
             return AUTH_GENERAL_ERROR;
         }
         if (dbd_password == NULL) {
-            dbd_password = apr_dbd_get_entry(dbd->driver, row, 0);
-
 #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >=
3)
             /* add the rest of the columns to the environment */
             int i = 1;
@@ -155,6 +153,7 @@
                 i++;
             }
 #endif
+            dbd_password = apr_dbd_get_entry(dbd->driver, row, 0);
         }
         /* we can't break out here or row won't get cleaned up */
     }
@@ -212,8 +211,6 @@
             return AUTH_GENERAL_ERROR;
         }
         if (dbd_hash == NULL) {
-            dbd_hash = apr_dbd_get_entry(dbd->driver, row, 0);
-
 #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >=
3)
             /* add the rest of the columns to the environment */
             int i = 1;
@@ -240,6 +237,7 @@
                 i++;
             }
 #endif
+            dbd_hash = apr_dbd_get_entry(dbd->driver, row, 0);
         }
         /* we can't break out here or row won't get cleaned up */
     }



Mime
View raw message