CVS commit: src/sys/dev/pci

2009-12-29 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Tue Dec 29 16:01:22 UTC 2009

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
- Fix an incorrect test for WM_F_EEPROM_INALID since rev. 1.183. Some old
  chips don't set EECD_EE_PRES.
- Fix a bug that WM_F_EEPROM_SPI and WM_F_FLASH are set.
- Add an missing decrement for a timeout reported by Wolfgang Stukenbrock
  in PR#42422.
- Add support for i82583V.
- PBA setting for i82574 is not 12K but 20K.
- Enable checking the management mode on 82574.


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/if_wmvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.184 src/sys/dev/pci/if_wm.c:1.185
--- src/sys/dev/pci/if_wm.c:1.184	Sun Dec 27 20:36:38 2009
+++ src/sys/dev/pci/if_wm.c	Tue Dec 29 16:01:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.184 2009/12/27 20:36:38 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.185 2009/12/29 16:01:21 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.184 2009/12/27 20:36:38 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.185 2009/12/29 16:01:21 msaitoh Exp $);
 
 #include bpfilter.h
 #include rnd.h
@@ -530,6 +530,7 @@
 static int	wm_kmrn_readreg(struct wm_softc *, int);
 static void	wm_kmrn_writereg(struct wm_softc *, int, int);
 
+static void	wm_set_spiaddrsize(struct wm_softc *);
 static int	wm_match(device_t, cfdata_t, void *);
 static void	wm_attach(device_t, device_t, void *);
 static int	wm_is_onboard_nvm_eeprom(struct wm_softc *);
@@ -547,14 +548,12 @@
 static int32_t	wm_ich8_flash_cycle(struct wm_softc *, uint32_t);
 static int32_t	wm_read_ich8_data(struct wm_softc *, uint32_t,
 		 uint32_t, uint16_t *);
-static int32_t	wm_read_ich8_byte(struct wm_softc *sc, uint32_t, uint8_t *);
-static int32_t	wm_read_ich8_word(struct wm_softc *sc, uint32_t, uint16_t *);
+static int32_t	wm_read_ich8_byte(struct wm_softc *, uint32_t, uint8_t *);
+static int32_t	wm_read_ich8_word(struct wm_softc *, uint32_t, uint16_t *);
 static void	wm_82547_txfifo_stall(void *);
 static int	wm_check_mng_mode(struct wm_softc *);
 static int	wm_check_mng_mode_ich8lan(struct wm_softc *);
-#if 0
 static int	wm_check_mng_mode_82574(struct wm_softc *);
-#endif
 static int	wm_check_mng_mode_generic(struct wm_softc *);
 static void	wm_get_hw_control(struct wm_softc *);
 static int	wm_check_for_link(struct wm_softc *);
@@ -562,7 +561,6 @@
 CFATTACH_DECL_NEW(wm, sizeof(struct wm_softc),
 wm_match, wm_attach, NULL, NULL);
 
-
 /*
  * Devices supported by this driver.
  */
@@ -772,6 +770,10 @@
 	  Intel i82574L,
 	  WM_T_82574,		WMP_F_1000T },
 
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82583V,
+	  Intel i82583V,
+	  WM_T_82583,		WMP_F_1000T },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_80K3LAN_CPR_DPT,
 	  i80003 dual 1000baseT Ethernet,
 	  WM_T_80003,		WMP_F_1000T },
@@ -884,6 +886,16 @@
 		wa-wa_high = 0;
 }
 
+static void
+wm_set_spiaddrsize(struct wm_softc *sc)
+{
+	uint32_t reg;
+
+	sc-sc_flags |= WM_F_EEPROM_SPI;
+	reg = CSR_READ(sc, WMREG_EECD);
+	sc-sc_ee_addrbits = (reg  EECD_EE_ABITS) ? 16 : 8;
+}
+
 static const struct wm_product *
 wm_lookup(const struct pci_attach_args *pa)
 {
@@ -1214,7 +1226,6 @@
 		goto fail_3;
 	}
 
-
 	/*
 	 * Create the transmit buffer DMA maps.
 	 */
@@ -1261,6 +1272,7 @@
 	case WM_T_82572:
 	case WM_T_82573:
 	case WM_T_82574:
+	case WM_T_82583:
 	case WM_T_80003:
 	case WM_T_ICH8:
 	case WM_T_ICH9:
@@ -1275,10 +1287,75 @@
 	/*
 	 * Get some information about the EEPROM.
 	 */
-	if ((sc-sc_type == WM_T_ICH8) || (sc-sc_type == WM_T_ICH9)
-	|| (sc-sc_type == WM_T_ICH10)) {
-		uint32_t flash_size;
-		sc-sc_flags |= WM_F_SWFWHW_SYNC | WM_F_EEPROM_FLASH;
+	switch (sc-sc_type) {
+	case WM_T_82542_2_0:
+	case WM_T_82542_2_1:
+	case WM_T_82543:
+	case WM_T_82544:
+		/* Microwire */
+		sc-sc_ee_addrbits = 6;
+		break;
+	case WM_T_82540:
+	case WM_T_82545:
+	case WM_T_82545_3:
+	case WM_T_82546:
+	case WM_T_82546_3:
+		/* Microwire */
+		reg = CSR_READ(sc, WMREG_EECD);
+		if (reg  EECD_EE_SIZE)
+			sc-sc_ee_addrbits = 8;
+		else
+			sc-sc_ee_addrbits = 6;
+		sc-sc_flags |= WM_F_EEPROM_HANDSHAKE;
+		break;
+	case WM_T_82541:
+	case WM_T_82541_2:
+	case WM_T_82547:
+	case WM_T_82547_2:
+		reg = CSR_READ(sc, WMREG_EECD);
+		if (reg  EECD_EE_TYPE) {
+			/* SPI */
+			wm_set_spiaddrsize(sc);
+		} else
+			/* Microwire */
+			sc-sc_ee_addrbits = (reg  EECD_EE_ABITS) ? 8 : 6;
+		sc-sc_flags |= WM_F_EEPROM_HANDSHAKE;
+		break;
+	case WM_T_82571:
+	case WM_T_82572:
+		/* SPI */
+		wm_set_spiaddrsize(sc);
+		sc-sc_flags |= WM_F_EEPROM_HANDSHAKE;
+		break;
+	case WM_T_82573:
+	case

CVS commit: src/external/bsd/libelf

2009-12-29 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Tue Dec 29 16:56:26 UTC 2009

Modified Files:
src/external/bsd/libelf: prepare-import.sh

Log Message:
We don't really need __RCSID() tags in these files, so just get rid of them.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libelf/prepare-import.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/libelf/prepare-import.sh
diff -u src/external/bsd/libelf/prepare-import.sh:1.1 src/external/bsd/libelf/prepare-import.sh:1.2
--- src/external/bsd/libelf/prepare-import.sh:1.1	Sat Dec 19 05:45:28 2009
+++ src/external/bsd/libelf/prepare-import.sh	Tue Dec 29 16:56:25 2009
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.1 2009/12/19 05:45:28 thorpej Exp $
+# $NetBSD: prepare-import.sh,v 1.2 2009/12/29 16:56:25 thorpej Exp $
 
 # Copy the FreeBSD src/lib/libelf directory contents to dist.  Run
 # this script and you're done.
@@ -22,8 +22,7 @@
 		/*	\$NetBSD\$	*/
 
 	EOF
-	sed -e 's,^__FBSDID.*,\/\*  \*\/\
-__RCSID\(\\$NetBSD\$\\)\;,g' ${f}  ${f}_tmp
+	sed -e 's,^__FBSDID.*,\/\*  \*\/,g' ${f}  ${f}_tmp
 	mv ${f}_tmp ${f}
 	;;
 *.[0-9])

CVS commit: src/external/bsd/libelf/dist

2009-12-29 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Tue Dec 29 16:58:10 UTC 2009

Update of /cvsroot/src/external/bsd/libelf/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13969

Log Message:
Import libelf from FreeBSD 8.0-RELEASE.  The main purpose of this is to
get a new import after prepare-import.sh was changed to not insert NetBSD
__RCSID() macros (which are problematic for host tool builds).

Status:

Vendor Tag: FreeBSD
Release Tags:   FreeBSD-8-0-RELEASE

U src/external/bsd/libelf/dist/_libelf.h
U src/external/bsd/libelf/dist/elf.3
U src/external/bsd/libelf/dist/elf_begin.3
C src/external/bsd/libelf/dist/elf_begin.c
U src/external/bsd/libelf/dist/elf_cntl.3
U src/external/bsd/libelf/dist/elf_cntl.c
C src/external/bsd/libelf/dist/elf_data.c
U src/external/bsd/libelf/dist/elf_end.3
U src/external/bsd/libelf/dist/elf_end.c
U src/external/bsd/libelf/dist/elf_errmsg.3
U src/external/bsd/libelf/dist/elf_errmsg.c
U src/external/bsd/libelf/dist/elf_errno.c
U src/external/bsd/libelf/dist/elf_fill.3
U src/external/bsd/libelf/dist/elf_fill.c
U src/external/bsd/libelf/dist/elf_flag.c
U src/external/bsd/libelf/dist/elf_flagdata.3
U src/external/bsd/libelf/dist/elf_getarhdr.3
U src/external/bsd/libelf/dist/elf_getarhdr.c
U src/external/bsd/libelf/dist/elf_getarsym.3
U src/external/bsd/libelf/dist/elf_getarsym.c
U src/external/bsd/libelf/dist/elf_getbase.3
U src/external/bsd/libelf/dist/elf_getbase.c
U src/external/bsd/libelf/dist/elf_getdata.3
U src/external/bsd/libelf/dist/elf_getident.3
U src/external/bsd/libelf/dist/elf_getident.c
U src/external/bsd/libelf/dist/elf_getphnum.3
U src/external/bsd/libelf/dist/elf_getscn.3
U src/external/bsd/libelf/dist/elf_getshnum.3
U src/external/bsd/libelf/dist/elf_getshstrndx.3
U src/external/bsd/libelf/dist/elf_hash.3
C src/external/bsd/libelf/dist/elf_hash.c
U src/external/bsd/libelf/dist/elf_kind.3
U src/external/bsd/libelf/dist/elf_kind.c
U src/external/bsd/libelf/dist/elf_memory.3
U src/external/bsd/libelf/dist/elf_memory.c
U src/external/bsd/libelf/dist/elf_next.3
U src/external/bsd/libelf/dist/elf_next.c
U src/external/bsd/libelf/dist/elf_phnum.c
U src/external/bsd/libelf/dist/elf_rand.3
U src/external/bsd/libelf/dist/elf_rand.c
U src/external/bsd/libelf/dist/elf_rawfile.3
U src/external/bsd/libelf/dist/elf_rawfile.c
C src/external/bsd/libelf/dist/elf_scn.c
U src/external/bsd/libelf/dist/elf_shnum.c
U src/external/bsd/libelf/dist/elf_shstrndx.c
U src/external/bsd/libelf/dist/elf_strptr.3
U src/external/bsd/libelf/dist/elf_strptr.c
U src/external/bsd/libelf/dist/elf_types.m4
U src/external/bsd/libelf/dist/elf_update.3
C src/external/bsd/libelf/dist/elf_update.c
U src/external/bsd/libelf/dist/elf_version.3
U src/external/bsd/libelf/dist/elf_version.c
U src/external/bsd/libelf/dist/gelf.3
U src/external/bsd/libelf/dist/gelf.h
C src/external/bsd/libelf/dist/gelf_cap.c
U src/external/bsd/libelf/dist/gelf_checksum.3
U src/external/bsd/libelf/dist/gelf_checksum.c
C src/external/bsd/libelf/dist/gelf_dyn.c
C src/external/bsd/libelf/dist/gelf_ehdr.c
U src/external/bsd/libelf/dist/gelf_fsize.3
U src/external/bsd/libelf/dist/gelf_fsize.c
U src/external/bsd/libelf/dist/gelf_getcap.3
U src/external/bsd/libelf/dist/gelf_getclass.3
U src/external/bsd/libelf/dist/gelf_getclass.c
U src/external/bsd/libelf/dist/gelf_getdyn.3
U src/external/bsd/libelf/dist/gelf_getehdr.3
U src/external/bsd/libelf/dist/gelf_getmove.3
U src/external/bsd/libelf/dist/gelf_getphdr.3
U src/external/bsd/libelf/dist/gelf_getrel.3
U src/external/bsd/libelf/dist/gelf_getrela.3
U src/external/bsd/libelf/dist/gelf_getshdr.3
U src/external/bsd/libelf/dist/gelf_getsym.3
U src/external/bsd/libelf/dist/gelf_getsyminfo.3
U src/external/bsd/libelf/dist/gelf_getsymshndx.3
C src/external/bsd/libelf/dist/gelf_move.c
U src/external/bsd/libelf/dist/gelf_newehdr.3
U src/external/bsd/libelf/dist/gelf_newphdr.3
C src/external/bsd/libelf/dist/gelf_phdr.c
C src/external/bsd/libelf/dist/gelf_rel.c
C src/external/bsd/libelf/dist/gelf_rela.c
C src/external/bsd/libelf/dist/gelf_shdr.c
C src/external/bsd/libelf/dist/gelf_sym.c
C src/external/bsd/libelf/dist/gelf_syminfo.c
C src/external/bsd/libelf/dist/gelf_symshndx.c
U src/external/bsd/libelf/dist/gelf_update_ehdr.3
U src/external/bsd/libelf/dist/gelf_xlate.c
U src/external/bsd/libelf/dist/gelf_xlatetof.3
C src/external/bsd/libelf/dist/libelf.c
U src/external/bsd/libelf/dist/libelf.h
C src/external/bsd/libelf/dist/libelf_align.c
C src/external/bsd/libelf/dist/libelf_allocate.c
C src/external/bsd/libelf/dist/libelf_ar.c
U src/external/bsd/libelf/dist/libelf_checksum.c
C src/external/bsd/libelf/dist/libelf_convert.m4
C src/external/bsd/libelf/dist/libelf_data.c
C src/external/bsd/libelf/dist/libelf_ehdr.c
U src/external/bsd/libelf/dist/libelf_extended.c
U src/external/bsd/libelf/dist/libelf_fsize.m4
C src/external/bsd/libelf/dist/libelf_msize.m4
C src/external/bsd/libelf/dist/libelf_phdr.c
U src/external/bsd/libelf/dist/libelf_shdr.c
C

CVS commit: src/etc/rc.d

2009-12-29 Thread Elad Efrat 
Module Name:src
Committed By:   elad
Date:   Tue Dec 29 17:06:11 UTC 2009

Modified Files:
src/etc/rc.d: securelevel

Log Message:
Securelevel might not be present, properly complain instead of printing
error messages from sysctl(8).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/securelevel

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/securelevel
diff -u src/etc/rc.d/securelevel:1.7 src/etc/rc.d/securelevel:1.8
--- src/etc/rc.d/securelevel:1.7	Wed Nov 12 12:35:52 2008
+++ src/etc/rc.d/securelevel	Tue Dec 29 17:06:10 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: securelevel,v 1.7 2008/11/12 12:35:52 ad Exp $
+# $NetBSD: securelevel,v 1.8 2009/12/29 17:06:10 elad Exp $
 #
 
 # PROVIDE: securelevel
@@ -19,7 +19,12 @@
 	#	it is 0, change it to 1 here, before we start daemons
 	#	or login services.
 	#
-	osecurelevel=$(sysctl -n kern.securelevel)
+	osecurelevel=$(sysctl -n kern.securelevel 2-)
+	if [ $? != 0 ]; then
+		echo Can't set securelevel. (kern.securelevel sysctl not present.)
+		exit 1
+	fi
+
 	if [ -n $securelevel -a $securelevel != $osecurelevel ]; then
 		if [ $securelevel -lt $osecurelevel ]; then
 			echo Can't lower securelevel.

CVS commit: src/doc

2009-12-29 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Tue Dec 29 17:26:50 UTC 2009

Modified Files:
src/doc: CHANGES

Log Message:
mention i82583V support in wm(4).


To generate a diff of this commit:
cvs rdiff -u -r1.1337 -r1.1338 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1337 src/doc/CHANGES:1.1338
--- src/doc/CHANGES:1.1337	Tue Dec 29 07:06:36 2009
+++ src/doc/CHANGES	Tue Dec 29 17:26:50 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1337 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1338 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -511,3 +511,4 @@
 	openssh: Import 5.3. [christos 20091226]
 	gfb: Add a driver for Sun XVR-1000 graphics boards
 		[macallan 20091229]
+	wm(4): Add support for i82583V	[msaitoh 20091230]

CVS commit: src

2009-12-29 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Tue Dec 29 17:32:18 UTC 2009

Modified Files:
src/external/bsd/libelf/dist: libelf.h
src/tools/libelf: Makefile

Log Message:
Include nbtool_config.h as needed.  Should fix missing defn of __unused in
some host tool environments.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libelf/dist/libelf.h
cvs rdiff -u -r1.2 -r1.3 src/tools/libelf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/libelf/dist/libelf.h
diff -u src/external/bsd/libelf/dist/libelf.h:1.5 src/external/bsd/libelf/dist/libelf.h:1.6
--- src/external/bsd/libelf/dist/libelf.h:1.5	Mon Dec 21 18:21:17 2009
+++ src/external/bsd/libelf/dist/libelf.h	Tue Dec 29 17:32:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: libelf.h,v 1.5 2009/12/21 18:21:17 thorpej Exp $	*/
+/*	$NetBSD: libelf.h,v 1.6 2009/12/29 17:32:18 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2006 Joseph Koshy
@@ -36,6 +36,7 @@
 #include inttypes.h
 
 #if HAVE_NBTOOL_CONFIG_H
+# include nbtool_config.h
 # include nbinclude/sys/exec_elf.h
 # define __LIBELF_HAVE_ELF_CAP  1
 # define __LIBELF_HAVE_ELF_MOVE 1

Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.2 src/tools/libelf/Makefile:1.3
--- src/tools/libelf/Makefile:1.2	Wed Dec 23 20:28:29 2009
+++ src/tools/libelf/Makefile	Tue Dec 29 17:32:18 2009
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2009/12/23 20:28:29 cegger Exp $
+#	$NetBSD: Makefile,v 1.3 2009/12/29 17:32:18 thorpej Exp $
+
+.include bsd.own.mk
 
 HOSTLIB=	elf
 
@@ -64,6 +66,10 @@
 # other file ops, on many systems, without changing function names.
 
 CPPFLAGS+=	-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
+.ifndef NOCOMPATLIB
+COMPATOBJ!= cd ${.CURDIR}/../compat  ${PRINTOBJDIR}
+CPPFLAGS+=	-I${COMPATOBJ}
+.endif
 
 .PATH:		${LIBELF_DIR}

CVS commit: src/sys/kern

2009-12-29 Thread Elad Efrat 
Module Name:src
Committed By:   elad
Date:   Tue Dec 29 17:49:22 UTC 2009

Modified Files:
src/sys/kern: kern_module.c

Log Message:
Move the listener plugging to module_init(), as it runs after kauth_init()
now. (Leaving only the module kthread creation in module_init2().)


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/kern/kern_module.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.54 src/sys/kern/kern_module.c:1.55
--- src/sys/kern/kern_module.c:1.54	Wed Nov 18 17:40:45 2009
+++ src/sys/kern/kern_module.c	Tue Dec 29 17:49:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.54 2009/11/18 17:40:45 pooka Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.55 2009/12/29 17:49:21 elad Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.54 2009/11/18 17:40:45 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.55 2009/12/29 17:49:21 elad Exp $);
 
 #define _MODULE_INTERNAL
 
@@ -137,6 +137,23 @@
 	}
 }
 
+static int
+module_listener_cb(kauth_cred_t cred, kauth_action_t action, void *cookie,
+void *arg0, void *arg1, void *arg2, void *arg3)
+{
+	int result;
+
+	result = KAUTH_RESULT_DEFER;
+
+	if (action != KAUTH_SYSTEM_MODULE)
+		return result;
+
+	if ((uintptr_t)arg2 != 0)	/* autoload */
+		result = KAUTH_RESULT_ALLOW;
+
+	return result;
+}
+
 /*
  * module_init:
  *
@@ -165,23 +182,9 @@
 	machine, __NetBSD_Version__ / 1,
 	__NetBSD_Version__ / 100 % 100);
 #endif
-}
-
-static int
-module_listener_cb(kauth_cred_t cred, kauth_action_t action, void *cookie,
-void *arg0, void *arg1, void *arg2, void *arg3)
-{
-	int result;
-
-	result = KAUTH_RESULT_DEFER;
-
-	if (action != KAUTH_SYSTEM_MODULE)
-		return result;
 
-	if ((uintptr_t)arg2 != 0)	/* autoload */
-		result = KAUTH_RESULT_ALLOW;
-
-	return result;
+	module_listener = kauth_listen_scope(KAUTH_SCOPE_SYSTEM,
+	module_listener_cb, NULL);
 }
 
 /*
@@ -198,9 +201,6 @@
 	NULL, NULL, modunload);
 	if (error != 0)
 		panic(module_init: %d, error);
-
-	module_listener = kauth_listen_scope(KAUTH_SCOPE_SYSTEM,
-	module_listener_cb, NULL);
 }
 
 SYSCTL_SETUP(sysctl_module_setup, sysctl module setup)

CVS commit: src/external/bsd/libelf/dist

2009-12-29 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Tue Dec 29 18:07:28 UTC 2009

Modified Files:
src/external/bsd/libelf/dist: elf.3

Log Message:
Do not use .Xo/.Xc to work around ancient roff limits.
Remove .TE without matching .TS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libelf/dist/elf.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/libelf/dist/elf.3
diff -u src/external/bsd/libelf/dist/elf.3:1.2 src/external/bsd/libelf/dist/elf.3:1.3
--- src/external/bsd/libelf/dist/elf.3:1.2	Mon Dec 21 18:27:48 2009
+++ src/external/bsd/libelf/dist/elf.3	Tue Dec 29 18:07:28 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: elf.3,v 1.2 2009/12/21 18:27:48 thorpej Exp $
+.\	$NetBSD: elf.3,v 1.3 2009/12/29 18:07:28 joerg Exp $
 .\
 .\ Copyright (c) 2006,2007 Joseph Koshy.  All rights reserved.
 .\
@@ -353,20 +353,13 @@
 and the types supported by the library.
 .Bl -column .Dv SHT_PREINIT_ARRAY .Dv ELF_T_SYMINFO
 .It Em Section Type Ta Em Library Type Ta Em Description
-.It Dv SHT_DYNAMIC Ta Dv ELF_T_DYN Ta Xo
-.Sq .dynamic
-section entries.
-.Xc
+.It Dv SHT_DYNAMIC Ta Dv ELF_T_DYN Ta So .dynamic Sc section entries.
 .It Dv SHT_DYNSYM Ta Dv ELF_T_SYM Ta Symbols for dynamic linking.
 .It Dv SHT_FINI_ARRAY Ta Dv ELF_T_ADDR Ta Termination function pointers.
 .It Dv SHT_GROUP Ta Dv ELF_T_WORD Ta Section group marker.
 .It Dv SHT_HASH Ta Dv ELF_T_HASH Ta Symbol hashes.
 .It Dv SHT_INIT_ARRAY Ta Dv ELF_T_ADDR Ta Initialization function pointers.
-.It Dv SHT_NOBITS Ta Dv ELF_T_BYTE Ta Xo
-Empty sections.
-See
-.Xr elf 5 .
-.Xc
+.It Dv SHT_NOBITS Ta Dv ELF_T_BYTE Ta Empty sections.  See Xr elf 5 .
 .It Dv SHT_NOTE Ta Dv ELF_T_NOTE Ta ELF note records.
 .It Dv SHT_PREINIT_ARRAY Ta Dv ELF_T_ADDR Ta Pre-initialization function pointers.
 .It Dv SHT_PROGBITS Ta Dv ELF_T_BYTE Ta Machine code.
@@ -381,7 +374,6 @@
 .It Dv SHT_SUNW_move Ta Dv ELF_T_MOVE Ta ELF move records.
 .It Dv SHT_SUNW_syminfo Ta Dv ELF_T_SYMINFO Ta Additional symbol flags.
 .El
-.TE
 .Ss Functional Grouping
 This section contains a brief overview of the available functionality
 in the ELF library.

CVS commit: src/usr.bin/login

2009-12-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Dec 29 20:15:15 UTC 2009

Modified Files:
src/usr.bin/login: common.c

Log Message:
don't repeat the word login twice (syslog prepends the program name login:)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/login/common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/login/common.c
diff -u src/usr.bin/login/common.c:1.2 src/usr.bin/login/common.c:1.3
--- src/usr.bin/login/common.c:1.2	Tue Dec 29 14:27:43 2009
+++ src/usr.bin/login/common.c	Tue Dec 29 15:15:15 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: common.c,v 1.2 2009/12/29 19:27:43 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.3 2009/12/29 20:15:15 christos Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: common.c,v 1.2 2009/12/29 19:27:43 christos Exp $);
+__RCSID($NetBSD: common.c,v 1.3 2009/12/29 20:15:15 christos Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -200,17 +200,17 @@
 			username, tty);
 	} else if (nested != NULL) {
 		if (remote)
-			syslog(LOG_NOTICE, login %s to %s on tty %s from %s / 
+			syslog(LOG_NOTICE, %s to %s on tty %s from %s / 
 			%s, nested, pwd-pw_name, tty, hname, assbuf);
 		else
-			syslog(LOG_NOTICE, login %s to %s on tty %s, nested,
+			syslog(LOG_NOTICE, %s to %s on tty %s, nested,
 			pwd-pw_name, tty);
 	} else {
 		if (remote)
-			syslog(LOG_NOTICE, login %s on tty %s from %s / %s,
+			syslog(LOG_NOTICE, %s on tty %s from %s / %s,
 			pwd-pw_name, tty, hname, assbuf);
 		else
-			syslog(LOG_NOTICE, login %s on tty %s, 
+			syslog(LOG_NOTICE, %s on tty %s, 
 			pwd-pw_name, tty);
 	}
 	(void)gettimeofday(now, NULL);

CVS commit: src/sys

2009-12-29 Thread Elad Efrat 
Module Name:src
Committed By:   elad
Date:   Tue Dec 29 20:21:46 UTC 2009

Modified Files:
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
src/sys/arch/amiga/stand/bootblock/ppcboot: Makefile
src/sys/arch/next68k/stand/boot: Makefile
src/sys/lib/libsa: exec.c

Log Message:
Don't abuse INSECURE for allowing exec() to load files not owned by uid 0.

Adjust references where this has been used.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/next68k/stand/boot/Makefile
cvs rdiff -u -r1.27 -r1.28 src/sys/lib/libsa/exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.40 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.41
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.40	Sat Oct 17 11:18:17 2009
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile	Tue Dec 29 20:21:45 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.40 2009/10/17 11:18:17 mlelstv Exp $
+#	$NetBSD: Makefile,v 1.41 2009/12/29 20:21:45 elad Exp $
 
 .include bsd.sys.mk		# for HOST_SH
 
@@ -48,8 +48,8 @@
 
 OBJS=	$(SOBJS) $(COBJS)
 
-#XX#DEFS = -D_STANDALONE -DINSECURE -DDYNAMIC_CRC_TABLE -DNOBYFOUR -UBYFOUR 
-DEFS = -D_STANDALONE -DINSECURE 
+#XX#DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER -DDYNAMIC_CRC_TABLE -DNOBYFOUR -UBYFOUR 
+DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER 
 DEFS += -D__INTERNAL_LIBSA_CREAD
 #DEFS += -DSERCONSOLE
 SOBJS += cread.o

Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.11 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.12
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.11	Mon Jan 12 07:42:30 2009
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile	Tue Dec 29 20:21:46 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2009/01/12 07:42:30 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.12 2009/12/29 20:21:46 elad Exp $
 
 ### what we need:
 
@@ -33,7 +33,7 @@
 
 OBJS=	$(SOBJS) $(COBJS)
 
-DEFS = -D_STANDALONE -DINSECURE -D_PRIMARY_BOOT
+DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER -D_PRIMARY_BOOT
 
 .NOPATH: ${OBJS} x.out f.out libboot.a xxstart.o
 

Index: src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.6 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.7
--- src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.6	Sun Oct 19 22:05:21 2008
+++ src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile	Tue Dec 29 20:21:46 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2008/10/19 22:05:21 apb Exp $
+#	$NetBSD: Makefile,v 1.7 2009/12/29 20:21:46 elad Exp $
 
 ### what we need:
 
@@ -28,7 +28,7 @@
 
 OBJS=	$(SOBJS) $(COBJS)
 
-DEFS = -DPPCBOOTER -D_STANDALONE -DINSECURE -DDEBUG_MEMORY_LIST
+DEFS = -DPPCBOOTER -D_STANDALONE -DSA_EXEC_ANYOWNER -DDEBUG_MEMORY_LIST
 
 ### main target: ###
 

Index: src/sys/arch/next68k/stand/boot/Makefile
diff -u src/sys/arch/next68k/stand/boot/Makefile:1.22 src/sys/arch/next68k/stand/boot/Makefile:1.23
--- src/sys/arch/next68k/stand/boot/Makefile:1.22	Mon Jan 12 07:47:47 2009
+++ src/sys/arch/next68k/stand/boot/Makefile	Tue Dec 29 20:21:46 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2009/01/12 07:47:47 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.23 2009/12/29 20:21:46 elad Exp $
 
 NOMAN=	# defined
 
@@ -25,7 +25,7 @@
 # XXX make defs arch-indep.
 INCLUDES+=	-I${.OBJDIR} -I${S}/arch -I${S} -I${S}/lib/libsa 
 DEFS+=		-D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP  -DDEBUG -DSD_DEBUG -DSCSI_DEBUG # -DEN_DEBUG   -DNETIF_DEBUG  
-SAMISCCPPFLAGS=	-DSUPPORT_DHCP -DSUPPORT_BOOTP -DINSECURE # -DBOOTP_DEBUG -DETHER_DEBUG -DNET_DEBUG # -DNETIF_DEBUG -DNFS_DEBUG  -DARP_DEBUG 
+SAMISCCPPFLAGS=	-DSUPPORT_DHCP -DSUPPORT_BOOTP -DSA_EXEC_ANYOWNER # -DBOOTP_DEBUG -DETHER_DEBUG -DNET_DEBUG # -DNETIF_DEBUG -DNFS_DEBUG  -DARP_DEBUG 
 WARNS=1
 CFLAGS+=	 -ffreestanding -nostdinc ${INCLUDES} ${DEFS}
 CFLAGS+=	-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith

Index: src/sys/lib/libsa/exec.c
diff -u src/sys/lib/libsa/exec.c:1.27 src/sys/lib/libsa/exec.c:1.28
--- src/sys/lib/libsa/exec.c:1.27	Sun Aug 16 13:26:16 2009
+++ src/sys/lib/libsa/exec.c	Tue Dec 29 20:21:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec.c,v 1.27 2009/08/16 13:26:16 matt Exp $	*/
+/*	$NetBSD: exec.c,v 1.28 2009/12/29 20:21:46 elad Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -29,13 +29,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef _KERNEL_OPT
-#include opt_insecure.h
-#endif
-
 #include sys/param.h
 #include

CVS commit: src/tools

2009-12-29 Thread Havard Eidnes 
Module Name:src
Committed By:   he
Date:   Tue Dec 29 22:13:01 UTC 2009

Modified Files:
src/tools: Makefile

Log Message:
To unbreak the build, temporarily remove the build of libelf here,
since no other part of the build depends on this yet.

Suggested as a temporary workaround by thorpej@


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/tools/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/Makefile
diff -u src/tools/Makefile:1.132 src/tools/Makefile:1.133
--- src/tools/Makefile:1.132	Wed Dec 23 20:15:21 2009
+++ src/tools/Makefile	Tue Dec 29 22:13:00 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.132 2009/12/23 20:15:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.133 2009/12/29 22:13:00 he Exp $
 
 .include bsd.own.mk
 
@@ -43,7 +43,6 @@
 	.WAIT awk \
 	.WAIT lex \
 	.WAIT pax \
-	.WAIT libelf \
 	.WAIT ${TOOLCHAIN_BITS} \
 		asn1_compile atf-compile cat cksum compile_et config db \
 		file lint1 \

CVS commit: src/lib

2009-12-29 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Tue Dec 29 23:01:09 UTC 2009

Modified Files:
src/lib: Makefile

Log Message:
avoid some subdirs that need -lcrypto, for MKCRYPTO=no.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.147 src/lib/Makefile:1.148
--- src/lib/Makefile:1.147	Mon Nov  2 10:13:19 2009
+++ src/lib/Makefile	Tue Dec 29 23:01:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.147 2009/11/02 10:13:19 plunky Exp $
+#	$NetBSD: Makefile,v 1.148 2009/12/29 23:01:09 mrg Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include bsd.own.mk
@@ -61,9 +61,11 @@
 SUBDIR+=	librefuse	# depends on libpuffs
 SUBDIR+=	librumpuser	# depends on libpthread
 
+.if (${MKCRYPTO} != no)
 # these depend on libcrypto*, libz and libbz2
 SUBDIR+=	../crypto/external/bsd/openssh/lib
 SUBDIR+=	../crypto/external/bsd/netpgp/lib
+.endif
 
 # 2nd library dependency barrier 
 SUBDIR+=	.WAIT
@@ -84,7 +86,9 @@
 SUBDIR+=	libpam		# depends on libkrb5, libkafs and more
 .endif
 
+.if (${MKCRYPTO} != no)
 SUBDIR+=	librumpcrypto	# depends on librump
+.endif
 SUBDIR+=	librumpdev	# depends on librump
 SUBDIR+=	librumpnet	# depends on librump
 SUBDIR+=	librumpvfs	# depends on librump

CVS commit: src/sys/dev/dm

2009-12-29 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Tue Dec 29 23:37:48 UTC 2009

Modified Files:
src/sys/dev/dm: device-mapper.c dm.h dm_dev.c dm_ioctl.c

Log Message:
Add private lock to dm_dev_t used for mutual exclusion for diks(9) api
routines. This change fixes PR kern/42532.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/dm/dm_dev.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dm/dm_ioctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.10 src/sys/dev/dm/device-mapper.c:1.11
--- src/sys/dev/dm/device-mapper.c:1.10	Sun Dec  6 14:33:46 2009
+++ src/sys/dev/dm/device-mapper.c	Tue Dec 29 23:37:47 2009
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.10 2009/12/06 14:33:46 haad Exp $ */
+/*$NetBSD: device-mapper.c,v 1.11 2009/12/29 23:37:47 haad Exp $ */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -402,8 +402,13 @@
 		return;
 	}
 
-	/* FIXME: have to be called with IPL_BIO*/
+	/*
+	 * disk(9) is part of device structure and it can't be used without
+	 * mutual exclusion, use diskp_mtx until it will be fixed.
+	 */
+	mutex_enter(dmv-diskp_mtx);
 	disk_busy(dmv-diskp);
+	mutex_exit(dmv-diskp_mtx);
 	
 	/* Select active table */
 	tbl = dm_table_get_entry(dmv-table_head, DM_TABLE_ACTIVE);
@@ -459,9 +464,10 @@
 	if (issued_len  buf_len)
 		nestiobuf_done(bp, buf_len - issued_len, EINVAL);
 
-	/* FIXME have to be called with SPL_BIO*/
+	mutex_enter(dmv-diskp_mtx);
 	disk_unbusy(dmv-diskp, buf_len, bp != NULL ? bp-b_flags  B_READ : 0);
-	
+	mutex_exit(dmv-diskp_mtx);
+		
 	dm_table_release(dmv-table_head, DM_TABLE_ACTIVE);
 	dm_dev_unbusy(dmv);
 

Index: src/sys/dev/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.16 src/sys/dev/dm/dm.h:1.17
--- src/sys/dev/dm/dm.h:1.16	Sun Dec  6 14:31:16 2009
+++ src/sys/dev/dm/dm.h	Tue Dec 29 23:37:48 2009
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.16 2009/12/06 14:31:16 haad Exp $  */
+/*$NetBSD: dm.h,v 1.17 2009/12/29 23:37:48 haad Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -43,6 +43,7 @@
 #include sys/rwlock.h
 #include sys/queue.h
 
+#include sys/device.h
 #include sys/disklabel.h
 
 #include prop/proplib.h
@@ -120,6 +121,7 @@
 	char name[DM_NAME_LEN];
 	char uuid[DM_UUID_LEN];
 
+	device_t devt; /* pointer to autoconf device_t structure */
 	uint64_t minor;
 	uint32_t flags; /* store communication protocol flags */
 
@@ -136,6 +138,7 @@
 	struct dm_dev_head upcalls;
 	
 	struct disk *diskp;
+	kmutex_t diskp_mtx;
 	
 	TAILQ_ENTRY(dm_dev) next_upcall; /* LIST of mirrored, snapshoted devices. */
 
@@ -357,6 +360,7 @@
 dm_dev_t* dm_dev_alloc(void);
 void dm_dev_busy(dm_dev_t *);
 int dm_dev_destroy(void);
+dm_dev_t* dm_dev_detach(device_t);
 int dm_dev_free(dm_dev_t *);
 int dm_dev_init(void);
 int dm_dev_insert(dm_dev_t *);

Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.6 src/sys/dev/dm/dm_dev.c:1.7
--- src/sys/dev/dm/dm_dev.c:1.6	Wed Sep  9 22:38:49 2009
+++ src/sys/dev/dm/dm_dev.c	Tue Dec 29 23:37:48 2009
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_dev.c,v 1.6 2009/09/09 22:38:49 haad Exp $  */
+/*$NetBSD: dm_dev.c,v 1.7 2009/12/29 23:37:48 haad Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,6 +50,7 @@
 
 kmutex_t dm_dev_mutex;
 
+/* dm_dev_mutex must be holdby caller before using disable_dev. */
 __inline static void
 disable_dev(dm_dev_t *dmv)
 {
@@ -220,6 +221,29 @@
 }
 #endif
 
+/*
+ * dm_dev_lookup_devt look for selected device_t. We keep this routine
+ * outside of dm_dev_lookup because it is a temporally solution.
+ *
+ * TODO: This is a hack autoconf should be more flexible.
+ */
+dm_dev_t *
+dm_dev_detach(device_t devt)
+{
+	dm_dev_t *dmv;
+	
+	mutex_enter(dm_dev_mutex);
+	TAILQ_FOREACH(dmv, dm_dev_list, next_devlist){
+		if (devt == dmv-devt){
+			disable_dev(dmv);
+			return dmv;
+		}
+	}
+	mutex_exit(dm_dev_mutex);
+	
+	return NULL;
+}
+
 /* 
  * Remove device selected with dm_dev from global list of devices. 
  */
@@ -321,6 +345,7 @@
 	KASSERT(dmv != NULL);
 
 	mutex_destroy(dmv-dev_mtx);
+	mutex_destroy(dmv-diskp_mtx);
 	cv_destroy(dmv-dev_cv);
 
 	if(dmv-diskp != NULL)

Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.17 src/sys/dev/dm/dm_ioctl.c:1.18
--- src/sys/dev/dm/dm_ioctl.c:1.17	Sun Dec  6 14:33:46 2009
+++ src/sys/dev/dm/dm_ioctl.c	Tue Dec 29 23:37:48 2009
@@ -1,5 +1,5 @@
 
-/*$NetBSD: dm_ioctl.c,v 1.17 2009/12/06 14:33:46 haad Exp $  */
+/*$NetBSD: dm_ioctl.c,v 1.18 2009/12/29 23:37:48 haad Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -237,6 +237,7 @@
 	dmv-dev_type = 0;
 	
 	mutex_init(dmv-dev_mtx, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(dmv-diskp_mtx,

CVS commit: othersrc/usr.bin/tnftp

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 00:03:25 UTC 2009

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
tnftp 20091122:
* rename getline() function to avoid nameclash with a new standard API.
* convert to automake  libtool


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.20 othersrc/usr.bin/tnftp/configure.ac:1.21
--- othersrc/usr.bin/tnftp/configure.ac:1.20	Sat Nov 14 08:32:42 2009
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Dec 30 00:03:25 2009
@@ -1,15 +1,15 @@
-#   $NetBSD: configure.ac,v 1.20 2009/11/14 08:32:42 lukem Exp $
+#   $NetBSD: configure.ac,v 1.21 2009/12/30 00:03:25 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([tnftp], [20090606], [lu...@netbsd.org])
+AC_INIT([tnftp], [20091122], [lu...@netbsd.org])
 AC_PREREQ([2.61])
 
 AC_COPYRIGHT([
 Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.20 $])
+AC_REVISION([$Revision: 1.21 $])
 
 AS_SHELL_SANITIZE

CVS commit: othersrc/usr.bin/tnftp

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 00:07:00 UTC 2009

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen for 'tnftp 20091122'


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.34 othersrc/usr.bin/tnftp/configure:1.35
--- othersrc/usr.bin/tnftp/configure:1.34	Sat Nov 14 09:18:49 2009
+++ othersrc/usr.bin/tnftp/configure	Wed Dec 30 00:07:00 2009
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.20 .
+# From configure.ac Revision: 1.21 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for tnftp 20090606.
+# Generated by GNU Autoconf 2.64 for tnftp 20091122.
 #
 # Report bugs to lu...@netbsd.org.
 #
@@ -709,8 +709,8 @@
 # Identity of this package.
 PACKAGE_NAME='tnftp'
 PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20090606'
-PACKAGE_STRING='tnftp 20090606'
+PACKAGE_VERSION='20091122'
+PACKAGE_STRING='tnftp 20091122'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1444,7 +1444,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures tnftp 20090606 to adapt to many kinds of systems.
+\`configure' configures tnftp 20091122 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1514,7 +1514,7 @@
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of tnftp 20090606:;;
+ short | recursive ) echo Configuration of tnftp 20091122:;;
esac
   cat \_ACEOF
 
@@ -1630,7 +1630,7 @@
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-tnftp configure 20090606
+tnftp configure 20091122
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2413,7 +2413,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tnftp $as_me 20090606, which was
+It was created by tnftp $as_me 20091122, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -3368,7 +3368,7 @@
 
 # Define the identity of the package.
  PACKAGE='tnftp'
- VERSION='20090606'
+ VERSION='20091122'
 
 
 cat confdefs.h _ACEOF
@@ -22496,7 +22496,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log=
-This file was extended by tnftp $as_me 20090606, which was
+This file was extended by tnftp $as_me 20091122, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -22560,7 +22560,7 @@
 _ACEOF
 cat $CONFIG_STATUS _ACEOF || ac_write_fail=1
 ac_cs_version=\\
-tnftp config.status 20090606
+tnftp config.status 20091122
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'`\\

CVS commit: src/share/man/man9

2009-12-29 Thread Adam Hamsik 
Module Name:src
Committed By:   haad
Date:   Wed Dec 30 00:08:01 UTC 2009

Modified Files:
src/share/man/man9: disk.9

Log Message:
Mention problems which disk api have with concurrent usage remove splbio
line from man page because it is not true anymore, mention disk_isbusy and
add dm driver to references.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/share/man/man9/disk.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/disk.9
diff -u src/share/man/man9/disk.9:1.32 src/share/man/man9/disk.9:1.33
--- src/share/man/man9/disk.9:1.32	Wed May 20 06:38:39 2009
+++ src/share/man/man9/disk.9	Wed Dec 30 00:08:01 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: disk.9,v 1.32 2009/05/20 06:38:39 wiz Exp $
+.\	$NetBSD: disk.9,v 1.33 2009/12/30 00:08:01 haad Exp $
 .\
 .\ Copyright (c) 1995, 1996 Jason R. Thorpe.
 .\ All rights reserved.
@@ -30,7 +30,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd May 19, 2009
+.Dd December 30, 2009
 .Dt DISK 9
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Nm disk_destroy ,
 .Nm disk_busy ,
 .Nm disk_unbusy ,
+.Nm disk_isbusy ,
 .Nm disk_find ,
 .Nm disk_blocksize
 .Nd generic disk framework
@@ -63,6 +64,8 @@
 .Fn disk_busy struct disk *
 .Ft void
 .Fn disk_unbusy struct disk * long bcount int read
+.Ft bool
+.Fn disk_isbusy struct disk *
 .Ft struct disk *
 .Fn disk_find const char *
 .Ft void
@@ -127,8 +130,10 @@
 Drivers which currently make use of the detachment
 capability of the framework are the
 .Nm ccd
-and
+,
 .Nm vnd
+and
+.Nm dm
 pseudo-device drivers.
 .Pp
 The following is a brief description of each function in the framework:
@@ -181,6 +186,10 @@
 specifies the direction of I/O;
 if non-zero it means reading from the disk,
 otherwise it means writing to the disk.
+.It Fn disk_isbusy
+Returns 
+.Ar true 
+if disk is marked as busy and false if it is not.
 .It Fn disk_find
 Return a pointer to the disk structure corresponding to the name provided,
 or NULL if the disk does not exist.
@@ -374,6 +383,14 @@
 and
 .Fn disk_unbusy
 routines.
+Because 
+.Nm struct disk 
+is part of device driver private data it needs to be guarded. Mutual exclusion
+must be done by driver 
+.Fn disk_busy
+and
+.Fn disk_unbusy
+are not thread safe.
 The
 .Fn disk_busy
 routine should be called immediately before a command to the disk is
@@ -392,7 +409,9 @@
 	[ . . . ]
 
 	/* Tell the disk framework we're going busy. */
+	mutex_enter(\*[Am]sc-\*[Gt]sc_dk_mtx);
 	disk_busy(\*[Am]sc-\*[Gt]sc_dk);
+	mutex_exit(\*[Am]sc-\*[Gt]sc_dk_mtx);
 
 	/* Send command to the drive. */
 	[ . . . ]
@@ -403,10 +422,6 @@
 .Fn disk_busy
 is called, a timestamp is taken if the disk's busy counter moves from
 0 to 1, indicating the disk has gone from an idle to non-idle state.
-Note that
-.Fn disk_busy
-must be called at
-.Fn splbio .
 At the end of a transaction, the
 .Fn disk_unbusy
 routine should be called.
@@ -451,19 +466,23 @@
 
 	[ . . . ]
 
+	mutex_enter(\*[Am]sc-\*[Gt]sc_dk_mtx);
 	/* Notify the disk framework that we've completed the transfer. */
 	disk_unbusy(\*[Am]sc-\*[Gt]sc_dk, nbytes,
 	bp != NULL ? bp-\*[Gt]b_flags \*[Am] B_READ : 0);
+	mutex_exit(\*[Am]sc-\*[Gt]sc_dk_mtx);
 
 	[ . . . ]
 }
 .Ed
 .Pp
-Like
-.Fn disk_busy ,
+.Fn disk_isbusy 
+is used to get status of disk device it returns true if device is currently busy
+and false if it is not. Like 
+.Fn disk_busy
+and
 .Fn disk_unbusy
-must be called at
-.Fn splbio .
+it requires explicit locking from user side.
 .Sh CODE REFERENCES
 This section describes places within the
 .Nx
@@ -489,17 +508,21 @@
 The
 .Nx
 .Nm ccd
-and
+,
 .Nm vnd
+and
+.Nm dm
 drivers use the detachment capability of the framework.
 They are located in
 .Pa sys/dev/ccd.c
+,
+.Pa sys/dev/vnd.c
 and
-.Pa sys/dev/vnd.c .
+.Pa sys/dev/dm/device-mapper.c .
 .Sh SEE ALSO
 .Xr ccd 4 ,
 .Xr vnd 4 ,
-.Xr spl 9
+.Xr dm 4
 .Sh HISTORY
 The
 .Nx

CVS commit: othersrc/usr.bin/tnftp

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 00:13:57 UTC 2009

Modified Files:
othersrc/usr.bin/tnftp: NEWS

Log Message:
20091122


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/NEWS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/NEWS
diff -u othersrc/usr.bin/tnftp/NEWS:1.6 othersrc/usr.bin/tnftp/NEWS:1.7
--- othersrc/usr.bin/tnftp/NEWS:1.6	Sat Jun  6 07:19:33 2009
+++ othersrc/usr.bin/tnftp/NEWS	Wed Dec 30 00:13:57 2009
@@ -1,4 +1,8 @@
-This is tnftp version 20090520.
+This is tnftp version 20091122.
+
+Changes in tnftp from 20090606 to 20091122:
+
+	Portability fixes.
 
 Changes in tnftp from 20090520 to 20090606:

CVS commit: othersrc/usr.bin/tnftp

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 00:14:35 UTC 2009

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
tnftp 20091122


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.54 othersrc/usr.bin/tnftp/ChangeLog:1.55
--- othersrc/usr.bin/tnftp/ChangeLog:1.54	Sun Nov 15 10:16:04 2009
+++ othersrc/usr.bin/tnftp/ChangeLog	Wed Dec 30 00:14:35 2009
@@ -1,4 +1,8 @@
-$NetBSD: ChangeLog,v 1.54 2009/11/15 10:16:04 lukem Exp $
+$NetBSD: ChangeLog,v 1.55 2009/12/30 00:14:35 lukem Exp $
+
+Wed Dec 30 00:12:47 UTC 2009	lukem
+
+	* Release as tnftp 20091122
 
 Sun Nov 15 10:14:44 UTC 2009	lukem

CVS commit: src/sys/dev/pci

2009-12-29 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Wed Dec 30 00:24:38 UTC 2009

Modified Files:
src/sys/dev/pci: auich.c

Log Message:
Ensure that the memory or i/o space we need is accessible at attach
and resume.

Rework register mapping code path, using 'goto', so duplicate code
is reduced.

I've tested this on nvidia and sis auich(4)-compatible controllers.
In addition this change is reported to fix PR/39652.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/pci/auich.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.132 src/sys/dev/pci/auich.c:1.133
--- src/sys/dev/pci/auich.c:1.132	Thu Nov 26 15:17:08 2009
+++ src/sys/dev/pci/auich.c	Wed Dec 30 00:24:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: auich.c,v 1.132 2009/11/26 15:17:08 njoly Exp $	*/
+/*	$NetBSD: auich.c,v 1.133 2009/12/30 00:24:38 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auich.c,v 1.132 2009/11/26 15:17:08 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: auich.c,v 1.133 2009/12/30 00:24:38 jakllsch Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -215,8 +215,11 @@
 	int  sc_sts_reg;
 	/* 440MX workaround */
 	int  sc_dmamap_flags;
-	/* Native mode? */
-	int  sc_native_mode;
+	/* flags */
+	int  sc_iose	:1,
+	 sc_csr_io	:1,
+	 sc_csr_mem	:1,
+		 	:29;
 
 	/* sysctl */
 	struct sysctllog *sc_log;
@@ -482,46 +485,55 @@
 	if (d-id == PCIID_ICH4 || d-id == PCIID_ICH5 || d-id == PCIID_ICH6
 	|| d-id == PCIID_ICH7 || d-id == PCIID_I6300ESB
 	|| d-id == PCIID_ICH4MODEM) {
-		sc-sc_native_mode = 1;
 		/*
 		 * Use native mode for Intel 6300ESB and ICH4/ICH5/ICH6/ICH7
 		 */
+
+		sc-sc_csr_mem = 1;
+		v = pci_conf_read(pa-pa_pc, pa-pa_tag,
+		PCI_COMMAND_STATUS_REG);
+		pci_conf_write(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG,
+			   v | PCI_COMMAND_MEM_ENABLE);
+		pa-pa_flags |= PCI_FLAGS_MEM_ENABLED;
+
 		if (pci_mapreg_map(pa, ICH_MMBAR, PCI_MAPREG_TYPE_MEM, 0,
-   sc-iot, sc-mix_ioh, NULL, sc-mix_size)) {
-			v = pci_conf_read(pa-pa_pc, pa-pa_tag, ICH_CFG);
-			pci_conf_write(pa-pa_pc, pa-pa_tag, ICH_CFG,
-   v | ICH_CFG_IOSE);
-			if (pci_mapreg_map(pa, ICH_NAMBAR, PCI_MAPREG_TYPE_IO,
-	   0, sc-iot, sc-mix_ioh, NULL,
-	   sc-mix_size)) {
-aprint_error_dev(self, can't map codec i/o space\n);
-return;
-			}
+		sc-iot, sc-mix_ioh, NULL, sc-mix_size)) {
+			goto retry_map;
 		}
 		if (pci_mapreg_map(pa, ICH_MBBAR, PCI_MAPREG_TYPE_MEM, 0,
-   sc-iot, sc-aud_ioh, NULL, sc-aud_size)) {
-			v = pci_conf_read(pa-pa_pc, pa-pa_tag, ICH_CFG);
-			pci_conf_write(pa-pa_pc, pa-pa_tag, ICH_CFG,
-   v | ICH_CFG_IOSE);
-			if (pci_mapreg_map(pa, ICH_NABMBAR, PCI_MAPREG_TYPE_IO,
-	   0, sc-iot, sc-aud_ioh, NULL,
-	   sc-aud_size)) {
-aprint_error_dev(self, can't map device i/o space\n);
-return;
-			}
-		}
-	} else {
-		if (pci_mapreg_map(pa, ICH_NAMBAR, PCI_MAPREG_TYPE_IO, 0,
-   sc-iot, sc-mix_ioh, NULL, sc-mix_size)) {
-			aprint_error_dev(self, can't map codec i/o space\n);
-			return;
-		}
-		if (pci_mapreg_map(pa, ICH_NABMBAR, PCI_MAPREG_TYPE_IO, 0,
-   sc-iot, sc-aud_ioh, NULL, sc-aud_size)) {
-			aprint_error_dev(self, can't map device i/o space\n);
-			return;
+		sc-iot, sc-aud_ioh, NULL, sc-aud_size)) {
+			goto retry_map;
 		}
+		goto map_done;
+	} else
+		goto non_native_map;
+
+retry_map:
+	sc-sc_iose = 1;
+	v = pci_conf_read(pa-pa_pc, pa-pa_tag, ICH_CFG);
+	pci_conf_write(pa-pa_pc, pa-pa_tag, ICH_CFG,
+		   v | ICH_CFG_IOSE);
+
+non_native_map:
+	sc-sc_csr_io = 1;
+	v = pci_conf_read(pa-pa_pc, pa-pa_tag,
+	PCI_COMMAND_STATUS_REG);
+	pci_conf_write(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG,
+		   v | PCI_COMMAND_IO_ENABLE);
+	pa-pa_flags |= PCI_FLAGS_IO_ENABLED;
+
+	if (pci_mapreg_map(pa, ICH_NAMBAR, PCI_MAPREG_TYPE_IO, 0,
+			   sc-iot, sc-mix_ioh, NULL, sc-mix_size)) {
+		aprint_error_dev(self, can't map codec i/o space\n);
+		return;
 	}
+	if (pci_mapreg_map(pa, ICH_NABMBAR, PCI_MAPREG_TYPE_IO, 0,
+			   sc-iot, sc-aud_ioh, NULL, sc-aud_size)) {
+		aprint_error_dev(self, can't map device i/o space\n);
+		return;
+	}
+
+map_done:
 	sc-dmat = pa-pa_dmat;
 
 	/* enable bus mastering */
@@ -1578,12 +1590,19 @@
 	struct auich_softc *sc = device_private(dv);
 	pcireg_t v;
 
-	if (sc-sc_native_mode) {
+	if (sc-sc_iose) {
 		v = pci_conf_read(sc-sc_pc, sc-sc_pt, ICH_CFG);
 		pci_conf_write(sc-sc_pc, sc-sc_pt, ICH_CFG,
 			   v | ICH_CFG_IOSE);
 	}
 
+	v = pci_conf_read(sc-sc_pc, sc-sc_pt, PCI_COMMAND_STATUS_REG);
+	if (sc-sc_csr_io)
+		v |= PCI_COMMAND_IO_ENABLE;
+	if (sc-sc_csr_mem)
+		v |= PCI_COMMAND_MEM_ENABLE;
+	pci_conf_write(sc-sc_pc, sc-sc_pt, PCI_COMMAND_STATUS_REG, v);
+
 	auich_reset_codec(sc);
 	DELAY(1000);

CVS commit: src/share/man/man9

2009-12-29 Thread John Nemeth 
Module Name:src
Committed By:   jnemeth
Date:   Wed Dec 30 01:37:17 UTC 2009

Modified Files:
src/share/man/man9: disk.9

Log Message:
mdoclint


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/share/man/man9/disk.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/disk.9
diff -u src/share/man/man9/disk.9:1.33 src/share/man/man9/disk.9:1.34
--- src/share/man/man9/disk.9:1.33	Wed Dec 30 00:08:01 2009
+++ src/share/man/man9/disk.9	Wed Dec 30 01:37:17 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: disk.9,v 1.33 2009/12/30 00:08:01 haad Exp $
+\	$NetBSD: disk.9,v 1.34 2009/12/30 01:37:17 jnemeth Exp $
 .\
 .\ Copyright (c) 1995, 1996 Jason R. Thorpe.
 .\ All rights reserved.
@@ -129,11 +129,10 @@
 from the system.
 Drivers which currently make use of the detachment
 capability of the framework are the
-.Nm ccd
-,
-.Nm vnd
+.Nm ccd ,
+.Nm dm ,
 and
-.Nm dm
+.Nm vnd
 pseudo-device drivers.
 .Pp
 The following is a brief description of each function in the framework:
@@ -187,8 +186,8 @@
 if non-zero it means reading from the disk,
 otherwise it means writing to the disk.
 .It Fn disk_isbusy
-Returns 
-.Ar true 
+Returns
+.Ar true
 if disk is marked as busy and false if it is not.
 .It Fn disk_find
 Return a pointer to the disk structure corresponding to the name provided,
@@ -227,7 +226,7 @@
 .It Dv DIOCSDINFO struct disklabel
 Set in-memory disklabel.
 .It Dv DIOCWDINFO struct disklabel
-Set in-memory disklabel, and write on-disk disklabel.
+Set in-memory disklabel and write on-disk disklabel.
 .It Dv DIOCGPART struct partinfo
 Get partition information.
 This is used internally.
@@ -383,10 +382,10 @@
 and
 .Fn disk_unbusy
 routines.
-Because 
-.Nm struct disk 
-is part of device driver private data it needs to be guarded. Mutual exclusion
-must be done by driver 
+Because
+.Nm struct disk
+is part of device driver private data it needs to be guarded.
+Mutual exclusion must be done by driver
 .Fn disk_busy
 and
 .Fn disk_unbusy
@@ -432,7 +431,7 @@
 .Fn disk_unbusy
 are balanced.
 This routine also performs the actual metrics calculation.
-A timestamp is taken, and the difference from the timestamp taken in
+A timestamp is taken and the difference from the timestamp taken in
 .Fn disk_busy
 is added to the disk's total running time.
 The disk's timestamp is then updated in case there is more than one
@@ -476,9 +475,10 @@
 }
 .Ed
 .Pp
-.Fn disk_isbusy 
-is used to get status of disk device it returns true if device is currently busy
-and false if it is not. Like 
+.Fn disk_isbusy
+is used to get status of disk device it returns true if device is
+currently busy and false if it is not.
+Like
 .Fn disk_busy
 and
 .Fn disk_unbusy
@@ -507,22 +507,20 @@
 .Pp
 The
 .Nx
-.Nm ccd
-,
-.Nm vnd
+.Nm ccd ,
+.Nm dm ,
 and
-.Nm dm
+.Nm vnd
 drivers use the detachment capability of the framework.
 They are located in
-.Pa sys/dev/ccd.c
-,
-.Pa sys/dev/vnd.c
+.Pa sys/dev/ccd.c ,
+.Pa sys/dev/vnd.c ,
 and
 .Pa sys/dev/dm/device-mapper.c .
 .Sh SEE ALSO
 .Xr ccd 4 ,
-.Xr vnd 4 ,
-.Xr dm 4
+.Xr dm 4 ,
+.Xr vnd 4
 .Sh HISTORY
 The
 .Nx

CVS commit: othersrc/libexec/tnftpd

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 01:41:51 UTC 2009

Modified Files:
othersrc/libexec/tnftpd: NEWS

Log Message:
changes from 20081029


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 othersrc/libexec/tnftpd/NEWS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/libexec/tnftpd/NEWS
diff -u othersrc/libexec/tnftpd/NEWS:1.8 othersrc/libexec/tnftpd/NEWS:1.9
--- othersrc/libexec/tnftpd/NEWS:1.8	Thu Oct  9 02:06:21 2008
+++ othersrc/libexec/tnftpd/NEWS	Wed Dec 30 01:41:51 2009
@@ -1,6 +1,21 @@
-$NetBSD: NEWS,v 1.8 2008/10/09 02:06:21 lukem Exp $
+$NetBSD: NEWS,v 1.9 2009/12/30 01:41:51 lukem Exp $
 
-This is tnftpd version 20081009.
+This is tnftpd version 20091122.
+
+Changes in tnftpd from 20081009 to 20091122:
+
+	Portability improvements.
+
+	Security fixes for fts in the internal ls.
+	Received from OpenBSD via US-CERT as VU #590371.
+
+	Add support for Tru64 Security Integration Architecture (SIA)
+	authentication.
+
+	Fix shadow password expiry check for users with
+	large sp_max values.
+
+	Install to libexec not sbin.
 
 Changes in tnftpd from 20080929 to 20081009:

CVS commit: othersrc/libexec/tnftpd

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 01:42:42 UTC 2009

Modified Files:
othersrc/libexec/tnftpd: configure.ac

Log Message:
tnftpd 20091122


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 othersrc/libexec/tnftpd/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.26 othersrc/libexec/tnftpd/configure.ac:1.27
--- othersrc/libexec/tnftpd/configure.ac:1.26	Sat Nov  7 10:57:07 2009
+++ othersrc/libexec/tnftpd/configure.ac	Wed Dec 30 01:42:42 2009
@@ -1,20 +1,18 @@
-# $NetBSD: configure.ac,v 1.26 2009/11/07 10:57:07 lukem Exp $
+# $NetBSD: configure.ac,v 1.27 2009/12/30 01:42:42 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([tnftpd], [20081009], [lu...@netbsd.org])
+AC_INIT([tnftpd], [20091122], [lu...@netbsd.org])
 AC_PREREQ([2.61])
 
 AC_COPYRIGHT([
 Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.26 $])
+AC_REVISION([$Revision: 1.27 $])
 
 AS_SHELL_SANITIZE
 
-# AC_CANONICAL_TARGET
-
 AC_CONFIG_SRCDIR([tnftpd.h])
 AC_CONFIG_AUX_DIR([buildaux])
 AC_CONFIG_HEADERS([tnftpd_config.h])

CVS commit: othersrc/libexec/tnftpd

2009-12-29 Thread Luke Mewburn 
Module Name:othersrc
Committed By:   lukem
Date:   Wed Dec 30 01:48:08 UTC 2009

Modified Files:
othersrc/libexec/tnftpd: configure

Log Message:
regen for tnftpd 20091122


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 othersrc/libexec/tnftpd/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/libexec/tnftpd/configure
diff -u othersrc/libexec/tnftpd/configure:1.39 othersrc/libexec/tnftpd/configure:1.40
--- othersrc/libexec/tnftpd/configure:1.39	Sat Nov  7 10:59:00 2009
+++ othersrc/libexec/tnftpd/configure	Wed Dec 30 01:48:08 2009
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.26 .
+# From configure.ac Revision: 1.27 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for tnftpd 20081009.
+# Generated by GNU Autoconf 2.64 for tnftpd 20091122.
 #
 # Report bugs to lu...@netbsd.org.
 #
@@ -709,8 +709,8 @@
 # Identity of this package.
 PACKAGE_NAME='tnftpd'
 PACKAGE_TARNAME='tnftpd'
-PACKAGE_VERSION='20081009'
-PACKAGE_STRING='tnftpd 20081009'
+PACKAGE_VERSION='20091122'
+PACKAGE_STRING='tnftpd 20091122'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1449,7 +1449,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures tnftpd 20081009 to adapt to many kinds of systems.
+\`configure' configures tnftpd 20091122 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of tnftpd 20081009:;;
+ short | recursive ) echo Configuration of tnftpd 20091122:;;
esac
   cat \_ACEOF
 
@@ -1643,7 +1643,7 @@
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-tnftpd configure 20081009
+tnftpd configure 20091122
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2426,7 +2426,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tnftpd $as_me 20081009, which was
+It was created by tnftpd $as_me 20091122, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -2903,8 +2903,6 @@
 
 
 
-# AC_CANONICAL_TARGET
-
 
 ac_aux_dir=
 for ac_dir in buildaux $srcdir/buildaux; do
@@ -3383,7 +3381,7 @@
 
 # Define the identity of the package.
  PACKAGE='tnftpd'
- VERSION='20081009'
+ VERSION='20091122'
 
 
 cat confdefs.h _ACEOF
@@ -5265,7 +5263,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5268 configure'  conftest.$ac_ext
+  echo '#line 5266 configure'  conftest.$ac_ext
   if { { eval echo \\$as_me\:${as_lineno-$LINENO}: \$ac_compile\; } 5
   (eval $ac_compile) 25
   ac_status=$?
@@ -7683,11 +7681,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo \\$as_me:7686: $lt_compile\ 5)
+   (eval echo \\$as_me:7684: $lt_compile\ 5)
(eval $lt_compile 2conftest.err)
ac_status=$?
cat conftest.err 5
-   echo $as_me:7690: \$? = $ac_status 5
+   echo $as_me:7688: \$? = $ac_status 5
if (exit $ac_status)  test -s $ac_outfile; then
  # The compiler can only warn and ignore the option if not recognized
  # So say no if there are warnings other than the usual output.
@@ -7973,11 +7971,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo \\$as_me:7976: $lt_compile\ 5)
+   (eval echo \\$as_me:7974: $lt_compile\ 5)
(eval $lt_compile 2conftest.err)
ac_status=$?
cat conftest.err 5
-   echo $as_me:7980: \$? = $ac_status 5
+   echo $as_me:7978: \$? = $ac_status 5
if (exit $ac_status)  test -s $ac_outfile; then
  # The compiler can only warn and ignore the option if not recognized
  # So say no if there are warnings other than the usual output.
@@ -8077,11 +8075,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo \\$as_me:8080: $lt_compile\ 5)
+   (eval echo \\$as_me:8078: $lt_compile\ 5)
(eval $lt_compile 2out/conftest.err)
ac_status=$?
cat out/conftest.err 5
-   echo $as_me:8084: \$? = $ac_status 5
+   echo $as_me:8082: \$? = $ac_status 5
if (exit $ac_status)  test -s out/conftest2.$ac_objext
then
  # The compiler can only warn and ignore the option if not recognized
@@ -10102,7 +10100,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat  conftest.$ac_ext EOF
-#line 10105 configure
+#line 10103 configure

CVS commit: [matt-nb5-mips64] src/sys/arch/mips

2009-12-29 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Wed Dec 30 04:51:26 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.mips
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h locore.h pmap.h
proc.h pte.h vmparam.h
src/sys/arch/mips/mips [matt-nb5-mips64]: locore.S mips_machdep.c
pmap.c trap.c
Added Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_segtab.c

Log Message:
Please segtab lookups into separate file.
Add mips_add_physload
Add mips_init_lwp0_uarea
cleanup lwp0/cpu_info_store initialization.


To generate a diff of this commit:
cvs rdiff -u -r1.58.24.3 -r1.58.24.4 src/sys/arch/mips/conf/files.mips
cvs rdiff -u -r1.90.16.8 -r1.90.16.9 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.78.36.1.2.6 -r1.78.36.1.2.7 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.54.26.1 -r1.54.26.2 src/sys/arch/mips/include/pmap.h
cvs rdiff -u -r1.21.36.3 -r1.21.36.4 src/sys/arch/mips/include/proc.h
cvs rdiff -u -r1.19 -r1.19.18.1 src/sys/arch/mips/include/pte.h
cvs rdiff -u -r1.41.28.7 -r1.41.28.8 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.167.38.3 -r1.167.38.4 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.205.4.1.2.1.2.17 -r1.205.4.1.2.1.2.18 \
src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.179.16.6 -r1.179.16.7 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/mips/mips/pmap_segtab.c
cvs rdiff -u -r1.217.12.11 -r1.217.12.12 src/sys/arch/mips/mips/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/conf/files.mips
diff -u src/sys/arch/mips/conf/files.mips:1.58.24.3 src/sys/arch/mips/conf/files.mips:1.58.24.4
--- src/sys/arch/mips/conf/files.mips:1.58.24.3	Sun Sep 13 03:28:51 2009
+++ src/sys/arch/mips/conf/files.mips	Wed Dec 30 04:51:25 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.mips,v 1.58.24.3 2009/09/13 03:28:51 cliff Exp $
+#	$NetBSD: files.mips,v 1.58.24.4 2009/12/30 04:51:25 matt Exp $
 #
 
 defflag	opt_cputype.h		NOFPU
@@ -34,6 +34,7 @@
 file	arch/mips/mips/kgdb_machdep.c		kgdb
 file	arch/mips/mips/mem.c
 file	arch/mips/mips/pmap.c
+file	arch/mips/mips/pmap_segtab.c
 file	arch/mips/mips/trap.c			# trap handlers
 file	arch/mips/mips/syscall.c		# syscall entries
 file	arch/mips/mips/mips_machdep.c

Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.90.16.8 src/sys/arch/mips/include/cpu.h:1.90.16.9
--- src/sys/arch/mips/include/cpu.h:1.90.16.8	Mon Nov 23 23:48:58 2009
+++ src/sys/arch/mips/include/cpu.h	Wed Dec 30 04:51:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.90.16.8 2009/11/23 23:48:58 cliff Exp $	*/
+/*	$NetBSD: cpu.h,v 1.90.16.9 2009/12/30 04:51:26 matt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -393,7 +393,8 @@
 struct lwp;
 struct user;
 
-extern struct segtab *segbase;	/* current segtab base */
+extern struct segtab *segbase;		/* current segtab base */
+extern int mips_poolpage_vmfreelist;	/* freelist to allocate poolpages */
 
 /* copy.S */
 int8_t	ufetch_int8(void *);
@@ -477,9 +478,15 @@
 int	kdbpeek(vaddr_t);
 
 /* mips_machdep.c */
+struct mips_vmfreelist;
+struct phys_ram_seg;
 void	dumpsys(void);
 int	savectx(struct user *);
 void	mips_init_msgbuf(void);
+void	mips_init_lwp0_uarea(void);
+void	mips_page_physload(vaddr_t, vaddr_t,
+	const struct phys_ram_seg *, size_t,
+	const struct mips_vmfreelist *, size_t);
 void	savefpregs(struct lwp *);
 void	loadfpregs(struct lwp *);
 

Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.6 src/sys/arch/mips/include/locore.h:1.78.36.1.2.7
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.6	Sun Dec 13 00:25:30 2009
+++ src/sys/arch/mips/include/locore.h	Wed Dec 30 04:51:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78.36.1.2.6 2009/12/13 00:25:30 matt Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1.2.7 2009/12/30 04:51:26 matt Exp $ */
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -307,6 +307,12 @@
 	uintptr_t lsw_setfunc_trampoline;
 };
 
+struct mips_vmfreelist {
+	paddr_t fl_start;
+	paddr_t fl_end;
+	int fl_freelist;
+};
+
 /*
  * The active locore-fuction vector, and
  */

Index: src/sys/arch/mips/include/pmap.h
diff -u src/sys/arch/mips/include/pmap.h:1.54.26.1 src/sys/arch/mips/include/pmap.h:1.54.26.2
--- src/sys/arch/mips/include/pmap.h:1.54.26.1	Mon Sep  7 21:42:17 2009
+++ src/sys/arch/mips/include/pmap.h	Wed Dec 30 04:51:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.54.26.1 2009/09/07 21:42:17 matt Exp $	*/
+/*	$NetBSD: pmap.h,v 1.54.26.2 2009/12/30 04:51:26 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -75,6 +75,7 @@
 #define	_MIPS_PMAP_H_
 
 #include mips/cpuregs.h	/* for KSEG0 below */
+#include mips/pte.h
 
 /*
  * The user address space is 2Gb (0x0 - 0x8000).
@@ -100,7 +101,6 @@
 
 #define mips_trunc_seg(x)	((vaddr_t)(x)  ~SEGOFSET)
 #define mips_round_seg(x)

CVS commit: src/sys/kern

2009-12-29 Thread Elad Efrat 
Module Name:src
Committed By:   elad
Date:   Wed Dec 30 06:58:51 UTC 2009

Modified Files:
src/sys/kern: uipc_socket.c

Log Message:
Use credentials from the socket.


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/kern/uipc_socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.198 src/sys/kern/uipc_socket.c:1.199
--- src/sys/kern/uipc_socket.c:1.198	Tue Dec 29 04:23:43 2009
+++ src/sys/kern/uipc_socket.c	Wed Dec 30 06:58:50 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.198 2009/12/29 04:23:43 elad Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.199 2009/12/30 06:58:50 elad Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.198 2009/12/29 04:23:43 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.199 2009/12/30 06:58:50 elad Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_sock_counters.h
@@ -452,10 +452,8 @@
 	case KAUTH_REQ_NETWORK_SOCKET_DROP: {
 		/* Normal users can only drop their own connections. */
 		struct socket *so = (struct socket *)arg1;
-		uid_t sockuid = so-so_uidinfo-ui_uid;
 
-		if (sockuid == kauth_cred_getuid(cred) ||
-		sockuid == kauth_cred_geteuid(cred))
+		if (proc_uidmatch(cred, so-so_cred))
 			result = KAUTH_RESULT_ALLOW;
 
 		break;

CVS commit: src/sys/netinet

2009-12-29 Thread Elad Efrat 
Module Name:src
Committed By:   elad
Date:   Wed Dec 30 06:59:32 UTC 2009

Modified Files:
src/sys/netinet: tcp_usrreq.c

Log Message:
Get the uid from the socket's credentials.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/netinet/tcp_usrreq.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.157 src/sys/netinet/tcp_usrreq.c:1.158
--- src/sys/netinet/tcp_usrreq.c:1.157	Wed Sep 16 15:23:05 2009
+++ src/sys/netinet/tcp_usrreq.c	Wed Dec 30 06:59:32 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_usrreq.c,v 1.157 2009/09/16 15:23:05 pooka Exp $	*/
+/*	$NetBSD: tcp_usrreq.c,v 1.158 2009/12/30 06:59:32 elad Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.157 2009/09/16 15:23:05 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.158 2009/12/30 06:59:32 elad Exp $);
 
 #include opt_inet.h
 #include opt_ipsec.h
@@ -1161,7 +1161,7 @@
 	int error;
 	uid_t uid;
 
-	uid = sockp-so_uidinfo-ui_uid;
+	uid = kauth_cred_geteuid(sockp-so_cred);
 	if (oldp) {
 		sz = MIN(sizeof(uid), *oldlenp);
 		error = copyout(uid, oldp, sz);

CVS commit: src/sys/dist/pf/net

2009-12-29 Thread Elad Efrat 
Module Name:src
Committed By:   elad
Date:   Wed Dec 30 07:00:01 UTC 2009

Modified Files:
src/sys/dist/pf/net: pf.c

Log Message:
Get uid/gid from the socket's credentials.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dist/pf/net/pf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.57 src/sys/dist/pf/net/pf.c:1.58
--- src/sys/dist/pf/net/pf.c:1.57	Mon Sep 14 10:36:49 2009
+++ src/sys/dist/pf/net/pf.c	Wed Dec 30 07:00:01 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf.c,v 1.57 2009/09/14 10:36:49 degroote Exp $	*/
+/*	$NetBSD: pf.c,v 1.58 2009/12/30 07:00:01 elad Exp $	*/
 /*	$OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
 
 /*
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf.c,v 1.57 2009/09/14 10:36:49 degroote Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf.c,v 1.58 2009/12/30 07:00:01 elad Exp $);
 
 #include bpfilter.h
 #include pflog.h
@@ -2824,12 +2824,13 @@
 		break;
 #endif /* INET6 */
 	}
-	pd-lookup.uid = so-so_uidinfo-ui_uid;
+	pd-lookup.uid = kauth_cred_geteuid(so-so_cred);
+	pd-lookup.gid = kauth_cred_getegid(so-so_cred);
 #else
 	so = inp-inp_socket;
 	pd-lookup.uid = so-so_euid;
+	pd-lookup.uid = so-so_egid;
 #endif /* !__NetBSD__ */
-	pd-lookup.gid = so-so_egid;
 	pd-lookup.pid = so-so_cpid;
 	return (1);
 }