From owner-cvs-src@FreeBSD.ORG  Mon Jul  9 16:20:42 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0762516A469;
	Mon,  9 Jul 2007 16:20:42 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id D41E113C4BA;
	Mon,  9 Jul 2007 16:20:41 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69GKfgd067093;
	Mon, 9 Jul 2007 16:20:41 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69GKfM2067092;
	Mon, 9 Jul 2007 16:20:41 GMT (envelope-from sam)
Message-Id: <200707091620.l69GKfM2067092@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 9 Jul 2007 16:20:41 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/hostapd eap.c eap.h eapol_sm.c
 ieee802_1x.c ieee802_1x.h wpa.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jul 2007 16:20:42 -0000

sam         2007-07-09 16:20:41 UTC

  FreeBSD src repository

  Modified files:
    contrib/hostapd      eap.c eap.h eapol_sm.c ieee802_1x.c 
                         ieee802_1x.h wpa.c 
  Log:
  resolve conflicts
  
  Approved by:    re (hrs)
  
  Revision  Changes      Path
  1.4       +356 -162    src/contrib/hostapd/eap.c
  1.4       +32 -6       src/contrib/hostapd/eap.h
  1.5       +231 -226    src/contrib/hostapd/eapol_sm.c
  1.5       +471 -251    src/contrib/hostapd/ieee802_1x.c
  1.4       +28 -32      src/contrib/hostapd/ieee802_1x.h
  1.5       +2237 -1339  src/contrib/hostapd/wpa.c