comparison: freeradius/freeradius.patch
freeradius/freeradius.patch
- changeset 398
- 08f5eb82b58f
- parent 48
- e12fbbfbe80e
equal
deleted
inserted
replaced
| 1:24e54aaf1322 | 2:de557b72ce4f |
|---|---|
| 1 Index: Make.inc.in | 1 Index: Make.inc.in |
| 2 --- Make.inc.in.orig 2008-09-25 10:41:26 +0200 | 2 --- Make.inc.in.orig 2010-05-24 07:40:58.000000000 +0200 |
| 3 +++ Make.inc.in 2008-09-25 17:56:09 +0200 | 3 +++ Make.inc.in 2010-05-24 23:54:11.000000000 +0200 |
| 4 @@ -15,7 +15,7 @@ | 4 @@ -15,7 +15,7 @@ |
| 5 docdir = @docdir@ | 5 docdir = @docdir@ |
| 6 mandir = @mandir@ | 6 mandir = @mandir@ |
| 7 datadir = @datadir@ | 7 datadir = @datadir@ |
| 8 -dictdir = $(datadir)/freeradius | 8 -dictdir = $(datadir)/freeradius |
| 9 +dictdir = $(datadir) | 9 +dictdir = $(datadir) |
| 10 logdir = @logdir@ | 10 logdir = @logdir@ |
| 11 includedir = @includedir@ | 11 includedir = @includedir@ |
| 12 raddbdir = @raddbdir@ | 12 raddbdir = @raddbdir@ |
| 13 @@ -48,7 +48,7 @@ | 13 @@ -49,7 +49,7 @@ |
| 14 | 14 |
| 15 LOGDIR = ${logdir} | 15 LOGDIR = ${logdir} |
| 16 RADDBDIR = ${raddbdir} | 16 RADDBDIR = ${raddbdir} |
| 17 -RUNDIR = ${localstatedir}/run/radiusd | 17 -RUNDIR = ${localstatedir}/run/radiusd |
| 18 +RUNDIR = ${localstatedir} | 18 +RUNDIR = ${localstatedir} |
| 19 SBINDIR = ${sbindir} | 19 SBINDIR = ${sbindir} |
| 20 RADIR = ${radacctdir} | 20 RADIR = ${radacctdir} |
| 21 LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la | 21 LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la |
| 22 Index: raddb/radiusd.conf.in | 22 Index: raddb/radiusd.conf.in |
| 23 --- raddb/radiusd.conf.in.orig 2008-09-25 10:41:26 +0200 | 23 --- raddb/radiusd.conf.in.orig 2010-05-24 07:40:58.000000000 +0200 |
| 24 +++ raddb/radiusd.conf.in 2008-09-25 17:56:09 +0200 | 24 +++ raddb/radiusd.conf.in 2010-05-24 23:54:11.000000000 +0200 |
| 25 @@ -66,7 +66,7 @@ | 25 @@ -66,7 +66,7 @@ |
| 26 | 26 |
| 27 # Location of config and logfiles. | 27 # Location of config and logfiles. |
| 28 confdir = ${raddbdir} | 28 confdir = ${raddbdir} |
| 29 -run_dir = ${localstatedir}/run/radiusd | 29 -run_dir = ${localstatedir}/run/${name} |
| 30 +run_dir = ${localstatedir} | 30 +run_dir = ${localstatedir} |
| 31 | 31 |
| 32 # Should likely be ${localstatedir}/lib/radiusd | 32 # Should likely be ${localstatedir}/lib/radiusd |
| 33 db_dir = ${raddbdir} | 33 db_dir = ${raddbdir} |
| 34 Index: src/modules/rlm_sql/drivers/Makefile.in | 34 Index: src/main/event.c |
| 35 --- src/modules/rlm_sql/drivers/Makefile.in.orig 2008-09-25 10:41:26 +0200 | 35 --- src/main/event.c.orig 2010-05-24 07:40:58.000000000 +0200 |
| 36 +++ src/modules/rlm_sql/drivers/Makefile.in 2008-09-25 17:56:09 +0200 | 36 +++ src/main/event.c 2010-05-25 08:53:57.000000000 +0200 |
| 37 @@ -16,7 +16,7 @@ | 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 | |
| 38 | 40 |
| 39 common: | 41 +#if defined(HAVE_PTHREAD_H) |
| 40 @[ -d lib/ ] || mkdir lib | 42 static pthread_t NO_SUCH_CHILD_PID; |
| 41 - @for mod in $(SQL_MODULES); do \ | 43 +#endif |
| 42 + @for mod in $(SQL_MODULES) NOOP; do \ | 44 #else |
| 43 echo "Making $(WHAT_TO_MAKE) in $$mod..."; \ | 45 /* |
| 44 - $(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \ | 46 * This is easier than ifdef's throughout the code. |
| 45 + [ -d $$mod ] || exit 0; $(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \ | |
| 46 done | |
| 47 Index: src/main/command.c | |
| 48 --- src/main/command.c.orig 2009-01-08 19:39:52.565611820 +0100 | |
| 49 +++ src/main/command.c 2009-01-08 19:40:18.333372190 +0100 | |
| 50 @@ -148,7 +148,7 @@ | |
| 51 salocal.sun_family = AF_UNIX; | |
| 52 memcpy(salocal.sun_path, path, len + 1); /* SUN_LEN does strlen */ | |
| 53 | |
| 54 - socklen = SUN_LEN(&salocal); | |
| 55 + socklen = sizeof(salocal) - sizeof(salocal.sun_path) + strlen(salocal.sun_path); | |
| 56 | |
| 57 /* | |
| 58 * Check the path. | |
| 59 Index: src/main/radmin.c | |
| 60 --- src/main/radmin.c.orig 2009-01-08 19:36:15.333428110 +0100 | |
| 61 +++ src/main/radmin.c 2009-01-08 19:39:15.131776575 +0100 | |
| 62 @@ -112,7 +112,7 @@ | |
| 63 saremote.sun_family = AF_UNIX; | |
| 64 memcpy(saremote.sun_path, path, len + 1); /* SUN_LEN does strlen */ | |
| 65 | |
| 66 - socklen = SUN_LEN(&saremote); | |
| 67 + socklen = sizeof(saremote) - sizeof(saremote.sun_path) + strlen(saremote.sun_path); | |
| 68 | |
| 69 if (connect(sockfd, (struct sockaddr *)&saremote, socklen) < 0) { | |
| 70 fprintf(stderr, "%s: Failed connecting to %s: %s\n", |
