From: serassio <>
Date: Sun, 3 Jul 2005 00:34:03 +0000 (+0000)
Subject: Fixed warning errors during build on FreeBSD and Solaris x86
X-Git-Tag: SQUID_3_0_PRE4~714
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7483aded444cae2c035b7053d4927dbb90a92125;p=thirdparty%2Fsquid.git

Fixed warning errors during build on FreeBSD and Solaris x86
---

diff --git a/helpers/basic_auth/PAM/pam_auth.c b/helpers/basic_auth/PAM/pam_auth.c
index 68963c9362..a794060a40 100644
--- a/helpers/basic_auth/PAM/pam_auth.c
+++ b/helpers/basic_auth/PAM/pam_auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pam_auth.c,v 1.15 2003/11/05 18:14:25 hno Exp $
+ * $Id: pam_auth.c,v 1.16 2005/07/02 18:34:03 serassio Exp $
  *
  * PAM authenticator module for Squid.
  * Copyright (C) 1999,2002,2003 Henrik Nordstrom <hno@squid-cache.org>
@@ -63,6 +63,8 @@
  * Compile this program with: gcc -o pam_auth pam_auth.c -lpam -ldl
  */
 
+#include "util.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -73,8 +75,6 @@
 
 #include <security/pam_appl.h>
 
-#include "util.h"
-
 #define BUFSIZE 8192
 
 
diff --git a/helpers/basic_auth/YP/nis_support.c b/helpers/basic_auth/YP/nis_support.c
index ec724475fa..05aec65293 100644
--- a/helpers/basic_auth/YP/nis_support.c
+++ b/helpers/basic_auth/YP/nis_support.c
@@ -2,9 +2,9 @@
  * Written By Rabellino Sergio (rabellino@di.unito.it) For Solaris 2.x
  */
 
-#include <strings.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <rpc/rpc.h>
diff --git a/helpers/external_acl/ip_user/main.c b/helpers/external_acl/ip_user/main.c
index 7b6bbe28a3..4c9ba46883 100644
--- a/helpers/external_acl/ip_user/main.c
+++ b/helpers/external_acl/ip_user/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.4 2004/08/14 22:54:52 hno Exp $ 
+/* $Id: main.c,v 1.5 2005/07/02 18:34:03 serassio Exp $ 
 * Copyright (C) 2002 Rodrigo Campos
 *
 * This program is free software; you can redistribute it and/or modify
@@ -18,14 +18,15 @@
 * Author: Rodrigo Campos (rodrigo@geekbunker.org)
 * 
 */
+
+#include "util.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
-
 #include "ip_user.h"
-#include "util.h"
 
 void
 usage (char *program_name)
diff --git a/helpers/external_acl/unix_group/check_group.c b/helpers/external_acl/unix_group/check_group.c
index 5f6805d895..d1bb6b7178 100644
--- a/helpers/external_acl/unix_group/check_group.c
+++ b/helpers/external_acl/unix_group/check_group.c
@@ -1,5 +1,5 @@
 /*
- * $Id: check_group.c,v 1.4 2004/08/14 22:54:53 hno Exp $
+ * $Id: check_group.c,v 1.5 2005/07/02 18:34:03 serassio Exp $
  *
  * This is a helper for the external ACL interface for Squid Cache
  * Copyright (C) 2002 Rodrigo Albani de Campos (rodrigo@geekbunker.org)
@@ -52,6 +52,8 @@
  *
  */
 
+#include "util.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -61,8 +63,6 @@
 #include <pwd.h>
 #include <ctype.h>
 
-#include "util.h"
-
 #define BUFSIZE 8192		/* the stdin buffer size */
 #define MAX_GROUP 10		/* maximum number of groups specified 
 				 * on the command line */