freeradius/freeradius.patch

Wed, 08 Feb 2012 20:07:00 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 08 Feb 2012 20:07:00 +0200
changeset 588
300d43423c2e
parent 48
e12fbbfbe80e
permissions
-rw-r--r--

Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.

     1 Index: Make.inc.in
     2 --- Make.inc.in.orig	2010-05-24 07:40:58.000000000 +0200
     3 +++ Make.inc.in	2010-05-24 23:54:11.000000000 +0200
     4 @@ -15,7 +15,7 @@
     5  docdir		= @docdir@
     6  mandir		= @mandir@
     7  datadir		= @datadir@
     8 -dictdir		= $(datadir)/freeradius
     9 +dictdir		= $(datadir)
    10  logdir		= @logdir@
    11  includedir	= @includedir@
    12  raddbdir	= @raddbdir@
    13 @@ -49,7 +49,7 @@
    15  LOGDIR		= ${logdir}
    16  RADDBDIR	= ${raddbdir}
    17 -RUNDIR		= ${localstatedir}/run/radiusd
    18 +RUNDIR		= ${localstatedir}
    19  SBINDIR		= ${sbindir}
    20  RADIR		= ${radacctdir}
    21  LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
    22 Index: raddb/radiusd.conf.in
    23 --- raddb/radiusd.conf.in.orig	2010-05-24 07:40:58.000000000 +0200
    24 +++ raddb/radiusd.conf.in	2010-05-24 23:54:11.000000000 +0200
    25 @@ -66,7 +66,7 @@
    27  #  Location of config and logfiles.
    28  confdir = ${raddbdir}
    29 -run_dir = ${localstatedir}/run/${name}
    30 +run_dir = ${localstatedir}
    32  # Should likely be ${localstatedir}/lib/radiusd
    33  db_dir = ${raddbdir}
    34 Index: src/main/event.c
    35 --- src/main/event.c.orig	2010-05-24 07:40:58.000000000 +0200
    36 +++ src/main/event.c	2010-05-25 08:53:57.000000000 +0200
    37 @@ -74,7 +74,9 @@
    38  #define PTHREAD_MUTEX_LOCK if (have_children) pthread_mutex_lock
    39  #define PTHREAD_MUTEX_UNLOCK if (have_children) pthread_mutex_unlock
    41 +#if defined(HAVE_PTHREAD_H)
    42  static pthread_t NO_SUCH_CHILD_PID;
    43 +#endif
    44  #else
    45  /*
    46   *	This is easier than ifdef's throughout the code.

mercurial