From owner-p4-projects@FreeBSD.ORG Thu Dec 2 07:14:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4981C16A4D0; Thu, 2 Dec 2004 07:14:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D55F16A4CE for ; Thu, 2 Dec 2004 07:14:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E325143D2D for ; Thu, 2 Dec 2004 07:14:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB27EJWk053433 for ; Thu, 2 Dec 2004 07:14:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB27EJ8e053430 for perforce@freebsd.org; Thu, 2 Dec 2004 07:14:19 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 07:14:19 GMT Message-Id: <200412020714.iB27EJ8e053430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 07:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=66243 Change 66243 by sam@sam_ebb on 2004/12/02 07:13:25 nuke some stuff that doesn't exist on freebsd and fix some warnings and it appears to work! Affected files ... .. //depot/projects/wifi/sbin/dhclient/bpf.c#2 edit .. //depot/projects/wifi/sbin/dhclient/dhclient.c#2 edit .. //depot/projects/wifi/sbin/dhclient/parse.c#2 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/bpf.c#2 (text+ko) ==== @@ -220,6 +220,7 @@ if (ioctl(info->rfdesc, BIOCSETF, &p) < 0) error("Can't install packet filter program: %m"); +#ifdef BIOCSETWF /* Set up the bpf write filter program structure. */ p.bf_len = dhcp_bpf_wfilter_len; p.bf_insns = dhcp_bpf_wfilter; @@ -232,6 +233,7 @@ if (ioctl(info->rfdesc, BIOCLOCK, NULL) < 0) error("Cannot lock bpf"); +#endif } ssize_t ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#2 (text+ko) ==== @@ -56,6 +56,10 @@ #include "dhcpd.h" #include "privsep.h" +#ifndef _PATH_VAREMPTY +#define _PATH_VAREMPTY "/var/empty" +#endif + #define PERIOD 0x2e #define hyphenchar(c) ((c) == 0x2d) #define bslashchar(c) ((c) == 0x5c) ==== //depot/projects/wifi/sbin/dhclient/parse.c#2 (text+ko) ==== @@ -437,7 +437,7 @@ parse_warn("numeric day of week expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_wday = atoi(val); @@ -447,7 +447,7 @@ parse_warn("numeric year expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_year = atoi(val); if (tm.tm_year > 1900) @@ -459,7 +459,7 @@ parse_warn("expected slash separating year from month."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Month... */ @@ -468,7 +468,7 @@ parse_warn("numeric month expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_mon = atoi(val) - 1; @@ -478,7 +478,7 @@ parse_warn("expected slash separating month from day."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Month... */ @@ -487,7 +487,7 @@ parse_warn("numeric day of month expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_mday = atoi(val); @@ -497,7 +497,7 @@ parse_warn("numeric hour expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_hour = atoi(val); @@ -507,7 +507,7 @@ parse_warn("expected colon separating hour from minute."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Minute... */ @@ -516,7 +516,7 @@ parse_warn("numeric minute expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_min = atoi(val); @@ -526,7 +526,7 @@ parse_warn("expected colon separating hour from minute."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Minute... */ @@ -535,7 +535,7 @@ parse_warn("numeric minute expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_sec = atoi(val); tm.tm_isdst = 0; @@ -548,7 +548,7 @@ if (token != SEMI) { parse_warn("semicolon expected."); skip_to_semi(cfile); - return (NULL); + return (0); } /* Guess the time value... */