- from Dan Harnett:

* remove himself from MAINTAINER as per his request
  * fix data types to correct compile time warnings
  * fix an off by one
- regen PLIST while here

note: this port should be marked as EOL and removed or is anyone still
using this?
This commit is contained in:
ajacoutot 2008-07-02 18:07:41 +00:00
parent 16102201ce
commit dcd5a59aab
5 changed files with 100 additions and 16 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2007/09/15 22:36:58 merdely Exp $
# $OpenBSD: Makefile,v 1.23 2008/07/02 18:07:41 ajacoutot Exp $
COMMENT= Lucent remote access RADIUS server
DISTNAME= radius21
PKGNAME= radiusd-lucent-2.1p7
PKGNAME= radiusd-lucent-2.1p8
CATEGORIES= net
MASTER_SITES= http://www.vergenet.net/linux/radius/download/
PATCHFILES= radius-2.1.comprehensive.6.patch.gz
@ -11,12 +11,12 @@ EXTRACT_SUFX= .tar.Z
HOMEPAGE= http://www.vergenet.net/linux/radius/
MAINTAINER= Dan Harnett <danh@openbsd.org>
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
WRKDIST= ${WRKDIR}

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-radius_src_acct_c,v 1.1 2008/07/02 18:07:41 ajacoutot Exp $
--- radius/src/acct.c.orig Mon Jun 30 13:39:26 2008
+++ radius/src/acct.c Mon Jun 30 13:40:45 2008
@@ -118,8 +118,8 @@ int fd;
int logok;
int proxied;
int retsig;
- int result;
- size_t salen;
+ ssize_t result;
+ socklen_t salen;
struct sockaddr_in *sin;
u_short port;

View File

@ -0,0 +1,34 @@
$OpenBSD: patch-radius_src_proxy_c,v 1.1 2008/07/02 18:07:41 ajacoutot Exp $
--- radius/src/proxy.c.orig Tue Jul 1 10:09:45 2008
+++ radius/src/proxy.c Tue Jul 1 10:12:16 2008
@@ -139,9 +139,9 @@ int fd;
char digest[AUTH_VECTOR_LEN];
char hold_digest[AUTH_VECTOR_LEN];
char *sentreqauth=NULL;
- int result;
+ ssize_t result;
int secretlen;
- size_t salen;
+ socklen_t salen;
struct sockaddr_in *sin;
struct sockaddr_in rad_saremote;
u_short port;
@@ -151,8 +151,7 @@ int fd;
auth = (AUTH_HDR *)recv_buffer;
- result = recvfrom (fd, (char *) recv_buffer,
- (int) sizeof(recv_buffer),
+ result = recvfrom (fd, (char *) recv_buffer, sizeof(recv_buffer),
(int) 0, (struct sockaddr *)&rad_saremote, &salen);
host = ntohl(sin->sin_addr.s_addr);
@@ -1063,7 +1062,7 @@ AUTH_REQ *authreq;
qp = qp->next;
}
}
- for (newid = curid; newid < 256; newid++) {
+ for (newid = curid; newid < 255; newid++) {
if (inuse[newid] == 0) {
curid = ((newid+1) & 0xff);
return newid;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-radius_src_radiusd_c,v 1.2 2003/06/29 04:48:39 avsm Exp $
--- radius/src/radiusd.c.orig Fri Jun 20 14:01:33 2003
+++ radius/src/radiusd.c Fri Jun 20 14:03:24 2003
$OpenBSD: patch-radius_src_radiusd_c,v 1.3 2008/07/02 18:07:41 ajacoutot Exp $
--- radius/src/radiusd.c.orig Tue Jul 1 10:08:23 2008
+++ radius/src/radiusd.c Tue Jul 1 10:09:19 2008
@@ -72,7 +72,6 @@ static char sccsid[] =
#include <errno.h>
#include <sys/wait.h>
@ -9,7 +9,43 @@ $OpenBSD: patch-radius_src_radiusd_c,v 1.2 2003/06/29 04:48:39 avsm Exp $
#include "radius.h"
#include "users.h"
@@ -2498,9 +2497,9 @@ const size_t hostnm_len;
@@ -627,8 +626,8 @@ int fd;
UINT4 addr;
char secret[20];
char hostnm[128];
- int result;
- size_t salen;
+ ssize_t result;
+ socklen_t salen;
struct sockaddr_in *sin;
u_short port;
@@ -644,8 +643,7 @@ int fd;
salen = sizeof (rad_saremote);
sin = (struct sockaddr_in *) & rad_saremote;
- result = recvfrom (fd, (char *) recv_buffer,
- (int) sizeof(recv_buffer),
+ result = recvfrom (fd, (char *) recv_buffer, sizeof(recv_buffer),
(int) 0, (struct sockaddr *)&rad_saremote, &salen);
addr = ntohl(sin->sin_addr.s_addr);
@@ -1847,12 +1845,12 @@ int activefd;
code = PW_PASSWORD_REJECT;
}
else {
-#endif PASSCHANGE
+#endif
code = PW_AUTHENTICATION_REJECT;
report[RR_REJECT]++;
#ifdef PASSCHANGE
}
-#endif PASSCHANGE
+#endif
DEBUG("sending reject to %s\n", req2strp(authreq));
total_length = build_packet(authreq,(VALUE_PAIR *)NULL,msg,code,FW_REPLY,send_buffer);
@@ -2498,9 +2496,9 @@ const size_t hostnm_len;
#define BUFFER_LEN 256
#define SECRET_LEN 64

View File

@ -1,13 +1,13 @@
@comment $OpenBSD: PLIST,v 1.8 2006/04/16 14:42:13 sturm Exp $
@comment $OpenBSD: PLIST,v 1.9 2008/07/02 18:07:41 ajacoutot Exp $
@conflict freeradius-*
@conflict radiusd-cistron-*
bin/builddbm
bin/dbmkeys
bin/dbmrec
bin/md5test
bin/radtest
bin/testuser
sbin/radiusd
@bin bin/builddbm
@bin bin/dbmkeys
@bin bin/dbmrec
@bin bin/md5test
@bin bin/radtest
@bin bin/testuser
@bin sbin/radiusd
share/doc/radiusd-lucent/
share/doc/radiusd-lucent/LICENSE
share/doc/radiusd-lucent/README