Re: npppd radius on current jan 21

[YASUOKA Masahiko]

On Wed, 30 Jan 2013 12:07:05 +0100
mxb <m...@alumni.chalmers.se> wrote:
> Yasuoka forgot to commit his fix.
> I have it working.

Oops, I forgot about that fix...

I've commited.  Also here is the diff.  Thanks,

Index: npppd_auth.c
===================================================================
RCS file: /cvs/src/usr.sbin/npppd/npppd/npppd_auth.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- npppd_auth.c        22 Sep 2012 20:22:48 -0000      1.11
+++ npppd_auth.c        31 Jan 2013 09:44:21 -0000      1.12
@@ -1,4 +1,4 @@
-/*     $OpenBSD: npppd_auth.c,v 1.11 2012/09/22 20:22:48 espie Exp $ */
+/*     $OpenBSD: npppd_auth.c,v 1.12 2013/01/31 09:44:21 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /**@file authentication realm */
-/* $Id: npppd_auth.c,v 1.11 2012/09/22 20:22:48 espie Exp $ */
+/* $Id: npppd_auth.c,v 1.12 2013/01/31 09:44:21 yasuoka Exp $ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -561,6 +561,10 @@ npppd_auth_radius_reload(npppd_auth_base
                        break;
                memcpy(&rad->server[i].peer, &server->address,
                    server->address.ss_len);
+               if (((struct sockaddr_in *)&rad->server[i].peer)->sin_port
+                   == 0)
+                       ((struct sockaddr_in *)&rad->server[i].peer)->sin_port
+                           = htons(DEFAULT_RADIUS_AUTH_PORT);
                strlcpy(rad->server[i].secret, server->secret,
                    sizeof(rad->server[i].secret));
                rad->server[i].enabled = 1;
@@ -578,6 +582,10 @@ npppd_auth_radius_reload(npppd_auth_base
                        break;
                memcpy(&rad->server[i].peer, &server->address,
                    server->address.ss_len);
+               if (((struct sockaddr_in *)&rad->server[i].peer)->sin_port
+                   == 0)
+                       ((struct sockaddr_in *)&rad->server[i].peer)->sin_port
+                           = htons(DEFAULT_RADIUS_ACCT_PORT);
                strlcpy(rad->server[i].secret, server->secret,
                    sizeof(rad->server[i].secret));
                rad->server[i].enabled = 1;
Index: parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/npppd/npppd/parse.y,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parse.y     13 Nov 2012 17:10:40 -0000      1.3
+++ parse.y     31 Jan 2013 09:44:21 -0000      1.4
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.3 2012/11/13 17:10:40 yasuoka Exp $ */
+/*     $OpenBSD: parse.y,v 1.4 2013/01/31 09:44:21 yasuoka Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henn...@openbsd.org>
@@ -677,7 +677,8 @@ radopt              : ADDRESS address optport SECRET
                                YYERROR;
                        }
                        n->address = $2;
-                       ((struct sockaddr_in *)&n->address)->sin_port = $3;
+                       ((struct sockaddr_in *)&n->address)->sin_port =
+                           htons($3);
                        n->secret = $5;
                        TAILQ_INSERT_TAIL(&curr_radconf->servers, n, entry);
                }