head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2
	netbsd-1-5-PATCH001:1.2
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2
	netbsd-1-4-PATCH002:1.1.1.1
	comdex-fall-1999:1.1.1.1
	netbsd-1-4-PATCH001:1.1.1.1
	netbsd-1-4-RELEASE:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2002.07.10.12.36.29;	author kim;	state dead;
branches;
next	1.2;

1.2
date	2000.08.06.15.35.10;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	99.03.22.03.15.09;	author kim;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.03.22.03.15.09;	author kim;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove Merit RADIUS.
@
text
@$NetBSD: patch-ad,v 1.2 2000/08/06 15:35:10 tron Exp $

--- src/rad.skey.c.orig	Sat Oct 10 22:18:08 1998
+++ src/rad.skey.c	Sun Aug  6 17:32:58 2000
@@@@ -2,6 +2,7 @@@@
 /*   Bradley Urberg Carlson <bradley@@mr.net>   */
 
 #include <stdio.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <syslog.h>
 #include <sys/param.h>
@@@@ -75,11 +76,15 @@@@
 		*ptr = NULL;
 	}
 
+#ifndef __NetBSD__
 	/* Check if this user has valid SKEY information and get the challenge. */
 	if (skeyinfo(&skey, username, challenge) == 0)
 	{
 		/* position the pointer in the key for verification */
 		if (skeylookup (&skey, username) != 0) 
+#else
+		if (skeychallenge (&skey, username, challenge, sizeof(challenge)) != 0) 
+#endif
 		{
 			dprintf(2, (LOG_DAEMON, LOG_DEBUG, "%s: skeylookup failed.", func));
 			return EV_NAK;
@@@@ -92,7 +97,9 @@@@
 		}
 		reply_sprintf (0, authreq, "%s", challenge);
 		return EV_NAK;
+#ifndef __NetBSD__
 	}
 	/* The user has no SKEY information.  Just NAK */
 	return EV_NAK;
+#endif
 }
@


1.2
log
@Make this build under NetBSD newer than 1.5.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Initial revision
@
text
@d3 11
a13 3
--- src/rad.skey.c.orig	Sat Oct 10 16:18:08 1998
+++ src/rad.skey.c	Sun Mar 21 21:26:32 1999
@@@@ -75,11 +75,15 @@@@
d29 1
a29 1
@@@@ -92,7 +96,9 @@@@
@


1.1.1.1
log
@Merit AAA RADIUS server
@
text
@@