]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix issues with some older GCC compilers
authorSimon Matter <simon.matter@invoca.ch>
Tue, 8 Mar 2011 07:27:00 +0000 (07:27 +0000)
committerDavid Sommerseth <davids@redhat.com>
Tue, 10 May 2011 11:24:51 +0000 (13:24 +0200)
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)

plugin/auth-pam/auth-pam.c

index 5a8e269acd6deb5f9793da828d8c38de2d55dd55..0454ee17d9859a670dba88f920e837d1723218a3 100644 (file)
@@ -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);