From owner-p4-projects@FreeBSD.ORG Thu Nov 2 10:43:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF24216A47B; Thu, 2 Nov 2006 10:43:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8CAF616A407 for ; Thu, 2 Nov 2006 10:43:53 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB16D43D68 for ; Thu, 2 Nov 2006 10:43:50 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA2AhnOY025698 for ; Thu, 2 Nov 2006 10:43:49 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA2Ahngf025693 for perforce@freebsd.org; Thu, 2 Nov 2006 10:43:49 GMT (envelope-from bushman@freebsd.org) Date: Thu, 2 Nov 2006 10:43:49 GMT Message-Id: <200611021043.kA2Ahngf025693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Nov 2006 10:43:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=109031 Change 109031 by bushman@bushman_nss_ldap_cached on 2006/11/02 10:43:38 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/snmpd.config#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidcontrol/hid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -108,6 +108,8 @@ .. gate .. + journal + .. label .. mirror ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/snmpd.config#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/snmpd.config,v 1.6 2006/02/27 16:31:01 harti Exp $ +# $FreeBSD: src/etc/snmpd.config,v 1.7 2006/10/31 10:23:28 harti Exp $ # # Example configuration file for bsnmpd(1). # @@ -6,7 +6,6 @@ # # Set some common variables # -host := foobar location := "Room 200" contact := "sysmeister@example.com" system := 1 # FreeBSD @@ -43,8 +42,7 @@ begemotSnmpdCommunityDisable = 1 # open standard SNMP ports -begemotSnmpdPortStatus.[$(host)].161 = 1 -begemotSnmpdPortStatus.127.0.0.1.161 = 1 +begemotSnmpdPortStatus.0.0.0.0.161 = 1 # open a unix domain socket begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 ==== //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.265 2006/10/31 22:22:29 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -45,8 +45,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \ - geom/nop geom/raid3 geom/shsec geom/stripe \ + geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ + geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.57 2006/09/30 11:32:46 ru Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.58 2006/11/01 09:02:10 jb Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -295,6 +295,7 @@ BLUETOOTH \ BOOT \ CALENDAR \ + CDDL \ CPP \ CRYPT \ CVS \ ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" SUCH DAMAGE. .\" .\" $Id: bthidcontrol.8,v 1.1 2004/02/13 21:44:41 max Exp $ -.\" $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8,v 1.3 2005/01/18 20:02:30 ru Exp $ +.\" $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8,v 1.4 2006/10/31 00:26:58 markus Exp $ .\" -.Dd February 13, 2004 +.Dd October 30, 2006 .Dt BTHIDCONTROL 8 .Os .Sh NAME @@ -38,6 +38,7 @@ .Op Fl a Ar BD_ADDR .Op Fl c Ar file .Op Fl H Ar file +.Op Fl v .Ar command .Sh DESCRIPTION The @@ -67,6 +68,8 @@ .Pa /var/db/bthidd.hids . .It Fl h Display usage message and exit. +.It Fl v +Be verbose and show items that are being used for padding. .It Ar command One of the supported commands (see below). Special command ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: bthidcontrol.c,v 1.2 2004/02/13 21:44:41 max Exp $ - * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c,v 1.1 2004/04/10 00:18:00 emax Exp $ + * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c,v 1.2 2006/10/31 00:26:58 markus Exp $ */ #include @@ -49,6 +49,8 @@ int32_t hid_sdp_query(bdaddr_t const *local, bdaddr_t const *remote, int32_t *error); +uint32_t verbose = 0; + /* * bthidcontrol */ @@ -62,7 +64,7 @@ hid_init(NULL); memcpy(&bdaddr, NG_HCI_BDADDR_ANY, sizeof(bdaddr)); - while ((opt = getopt(argc, argv, "a:c:H:h")) != -1) { + while ((opt = getopt(argc, argv, "a:c:H:hv")) != -1) { switch (opt) { case 'a': /* bdaddr */ if (!bt_aton(optarg, &bdaddr)) { @@ -83,6 +85,10 @@ hids_file = optarg; break; + case 'v': /* verbose */ + verbose++; + break; + case 'h': default: usage(); @@ -202,6 +208,7 @@ " -c file specify path to the bthidd config file\n" \ " -H file specify path to the bthidd HIDs file\n" \ " -h display usage and quit\n" \ +" -v be verbose\n" \ " command one of the supported commands\n"); exit(255); } /* usage */ ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidcontrol/hid.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: hid.c,v 1.3 2004/02/17 22:14:57 max Exp $ - * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/hid.c,v 1.1 2004/04/10 00:18:00 emax Exp $ + * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/hid.c,v 1.2 2006/10/31 00:26:58 markus Exp $ */ #include @@ -39,6 +39,8 @@ #include "bthid_config.h" #include "bthidcontrol.h" +extern uint32_t verbose; + static void hid_dump_descriptor (report_desc_t r); static void hid_dump_item (char const *label, struct hid_item *h); @@ -153,6 +155,9 @@ static void hid_dump_item(char const *label, struct hid_item *h) { + if ((h->flags & HIO_CONST) && !verbose) + return; + fprintf(stdout, "%s id=%u size=%u count=%u page=%s usage=%s%s%s%s%s%s%s%s%s%s", label, (uint8_t) h->report_ID, h->report_size, h->report_count, ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.14 2006/04/13 12:49:24 ru Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.15 2006/10/31 21:44:46 glebius Exp $ # # Author: Harti Brandt @@ -10,7 +10,8 @@ SRCS+= oid.h tree.c tree.h XSYM= snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \ sysUpTime snmpTrapOID coldStart authenticationFailure \ - begemotSnmpdTransUdp begemotSnmpdTransLsock begemotSnmpdLocalPortTable + begemotSnmpdTransUdp begemotSnmpdTransLsock begemotSnmpdLocalPortTable \ + freeBSDVersion CLEANFILES= oid.h tree.c tree.h MAN= bsnmpd.1 snmpmod.3 WARNS?= 6