Don't include libradius.h right after autoconf.h, it's already

	included in radiusd.h, which we already include

	in mainconfig.c, use new #ifdef HAVE_STRUCT_SOCKADDR_IN6, which
	we have yet to define.  This makes it build on non-IPv6 systems.

	modcall.c, include autoconf.h, which we didn't include before

diff --git a/src/main/acct.c b/src/main/acct.c
index 1c3cd96..7148caf 100644 (file)
--- a/src/main/acct.c
+++ b/src/main/acct.c
@@ -26,7 +26,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/auth.c b/src/main/auth.c
index 3407d36..da0bc84 100644 (file)
--- a/src/main/auth.c
+++ b/src/main/auth.c
@@ -25,7 +25,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/client.c b/src/main/client.c
index ece02ad..9356cfa 100644 (file)
--- a/src/main/client.c
+++ b/src/main/client.c
@@ -25,7 +25,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/stat.h>
 

diff --git a/src/main/conffile.c b/src/main/conffile.c
index f8f9244..56bc68f 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -27,7 +27,6 @@
  */
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/files.c b/src/main/files.c
index 4257b1d..b4636bb 100644 (file)
--- a/src/main/files.c
+++ b/src/main/files.c
@@ -25,7 +25,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/stat.h>
 

diff --git a/src/main/log.c b/src/main/log.c
index 528f21d..1f2ab12 100644 (file)
--- a/src/main/log.c
+++ b/src/main/log.c
@@ -26,7 +26,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 6ad9cc9..f4f3c26 100644 (file)
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -22,7 +22,6 @@
  */
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -1066,6 +1065,7 @@ static int listen_bind(rad_listen_t *this)
                sa->sin_port = htons(this->port);
                salen = sizeof(*sa);
 
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (this->ipaddr.af == AF_INET6) {
                struct sockaddr_in6 *sa;
 
@@ -1075,7 +1075,7 @@ static int listen_bind(rad_listen_t *this)
                sa->sin6_addr = this->ipaddr.ipaddr.ip6addr;
                sa->sin6_port = htons(this->port);
                salen = sizeof(*sa);
-
+#endif
        } else {
                radlog(L_ERR|L_CONS, "ERROR: Unsupported protocol family %d",
                       this->ipaddr.af);

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 21b3bab..d0f55e9 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -19,6 +19,7 @@
  *
  * Copyright 2000  The FreeRADIUS server project
  */
+#include "autoconf.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/modules.c b/src/main/modules.c
index daf3e70..699c842 100644 (file)
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -25,7 +25,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/main/nas.c b/src/main/nas.c
index 277ccb5..55fd4b1 100644 (file)
--- a/src/main/nas.c
+++ b/src/main/nas.c
@@ -26,7 +26,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/stat.h>
 

diff --git a/src/main/radclient.c b/src/main/radclient.c
index 29b9992..422fa22 100644 (file)
--- a/src/main/radclient.c
+++ b/src/main/radclient.c
@@ -24,7 +24,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -55,6 +54,7 @@ static const char rcsid[] = "$Id$";
 #include "conf.h"
 #include "radpaths.h"
 #include "missing.h"
+#include "libradius.h"
 
 static int retries = 10;
 static float timeout = 3;

diff --git a/src/main/radius_snmp.c b/src/main/radius_snmp.c
index c77e692..db73f29 100644 (file)
--- a/src/main/radius_snmp.c
+++ b/src/main/radius_snmp.c
@@ -28,8 +28,6 @@ static const char rcsid[] =
 
 #ifdef WITH_SNMP
 
-#include "libradius.h"
-
 #ifdef HAVE_NETINET_IN_H
 #      include <netinet/in.h>
 #endif

diff --git a/src/main/radiusd.c b/src/main/radiusd.c
index 9a9865c..6f70c44 100644 (file)
--- a/src/main/radiusd.c
+++ b/src/main/radiusd.c
@@ -30,7 +30,6 @@ static const char rcsid[] =
 "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/file.h>
 

diff --git a/src/main/radrelay.c b/src/main/radrelay.c
index 06070e2..d761b1f 100644 (file)
--- a/src/main/radrelay.c
+++ b/src/main/radrelay.c
@@ -29,7 +29,6 @@ char radrelay_rcsid[] =
 "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/src/main/radsqlrelay.c b/src/main/radsqlrelay.c
index c3527e8..5584312 100644 (file)
--- a/src/main/radsqlrelay.c
+++ b/src/main/radsqlrelay.c
@@ -30,7 +30,6 @@ char radrelay_rcsid[] =
 "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/src/main/radwho.c b/src/main/radwho.c
index 06a6f85..d30ff66 100644 (file)
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -27,7 +27,6 @@ static const char rcsid[] =
 "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/request_list.c b/src/main/request_list.c
index be086a5..89a22eb 100644 (file)
--- a/src/main/request_list.c
+++ b/src/main/request_list.c
@@ -23,7 +23,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/request_process.c b/src/main/request_process.c
index 7e1e860..91d251f 100755 (executable)
--- a/src/main/request_process.c
+++ b/src/main/request_process.c
@@ -25,7 +25,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <sys/socket.h>
 

diff --git a/src/main/smux.c b/src/main/smux.c
index 78c4c1f..65ecb6c 100644 (file)
--- a/src/main/smux.c
+++ b/src/main/smux.c
@@ -29,8 +29,6 @@ static const char rcsid[] =
 
 #ifdef WITH_SNMP
 
-#include "libradius.h"
-
 #include <sys/socket.h>
 #include <sys/file.h>
 

diff --git a/src/main/threads.c b/src/main/threads.c
index 738f9eb..44f39c6 100644 (file)
--- a/src/main/threads.c
+++ b/src/main/threads.c
@@ -21,7 +21,7 @@
  * Copyright 2000  Alan DeKok <aland@ox.org>
  */
 
-#include "libradius.h"
+#include "autoconf.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/main/util.c b/src/main/util.c
index 5f4b030..380a3e6 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -23,7 +23,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/main/valuepair.c b/src/main/valuepair.c
index deeffed..22a700b 100644 (file)
--- a/src/main/valuepair.c
+++ b/src/main/valuepair.c
@@ -25,7 +25,6 @@
 static const char rcsid[] = "$Id$";
 
 #include "autoconf.h"
-#include "libradius.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/main/xlat.c b/src/main/xlat.c
index ca13c3a..b078b7d 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -26,7 +26,6 @@ static const char rcsid[] =
 "$Id$";
 
 #include       "autoconf.h"
-#include       "libradius.h"
 
 #include       <stdio.h>
 #include       <stdlib.h>