From: Simon Matter <simon.matter@invoca.ch>
Date: Tue, 8 Mar 2011 07:27:00 +0000 (+0000)
Subject: Fix issues with some older GCC compilers
X-Git-Tag: v2.2.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96ca4f3334b126ad972948d76add176a31116ca4;p=thirdparty%2Fopenvpn.git

Fix issues with some older GCC compilers

Some older GCC compilers don't like that variables are declared
in the middle of the code, and expect them on the top in the
block/scope.

Trac-ticket: 99
Signed-off-by: Simon Matter <simon.matter@invoca.ch>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
(cherry picked from commit aa52ca828fc075e010c326e91d2171484a514fde)
---

diff --git a/plugin/auth-pam/auth-pam.c b/plugin/auth-pam/auth-pam.c
index 5a8e269ac..0454ee17d 100644
--- a/plugin/auth-pam/auth-pam.c
+++ b/plugin/auth-pam/auth-pam.c
@@ -119,14 +119,14 @@ static void pam_server (int fd, const char *service, int verb, const struct name
 static char *
 searchandreplace(const char *tosearch, const char *searchfor, const char *replacewith)
 {
-  if (!tosearch || !searchfor || !replacewith) return 0;
-  if (!strlen(tosearch) || !strlen(searchfor) || !strlen(replacewith)) return 0;
-
   const char *searching=tosearch;
   char *scratch;
   char temp[strlen(tosearch)*10];
   temp[0]=0;
 
+  if (!tosearch || !searchfor || !replacewith) return 0;
+  if (!strlen(tosearch) || !strlen(searchfor) || !strlen(replacewith)) return 0;
+
   scratch = strstr(searching,searchfor);
   if (!scratch) return strdup(tosearch);