From owner-freebsd-current@FreeBSD.ORG Sun Oct 7 10:52:38 2007 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A9CA16A41B for ; Sun, 7 Oct 2007 10:52:38 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from smtp010.mail.ukl.yahoo.com (smtp010.mail.ukl.yahoo.com [217.12.11.79]) by mx1.freebsd.org (Postfix) with SMTP id F341613C461 for ; Sun, 7 Oct 2007 10:52:37 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: (qmail 87042 invoked from network); 7 Oct 2007 10:52:36 -0000 Received: from unknown (HELO Gatekeeper.FreeBSD.org) (st.esser@80.135.115.157 with login) by smtp010.mail.ukl.yahoo.com with SMTP; 7 Oct 2007 10:52:36 -0000 X-YMail-OSG: 6BuI7oIVM1mudajnyKKBu0o6AH5fL_kapT.1z28GqFUpjjO5 Received: from StefanEsser.FreeBSD.org (se [192.168.0.10]) by Gatekeeper.FreeBSD.org (Postfix) with ESMTP id A37F02C06; Sun, 7 Oct 2007 12:52:35 +0200 (CEST) Received: by StefanEsser.FreeBSD.org (Postfix, from userid 200) id 6251F43B5; Sun, 7 Oct 2007 12:52:35 +0200 (CEST) Date: Sun, 7 Oct 2007 12:52:35 +0200 From: Stefan =?iso-8859-1?Q?E=DFer?= To: current@freebsd.org Message-ID: <20071007105235.GA2505@StefanEsser.FreeBSD.org> Mail-Followup-To: Stefan =?iso-8859-1?Q?E=DFer?= , current@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-09) Cc: Subject: [Patch] man page nsswitch(5) still references cached in -CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2007 10:52:38 -0000 The renaming of cached to nscd has apparently not been tracked in all man pages. At least in the case of nsswitch(5), there are still references to cached and cached.conf. The attached patch fixes this. I did not search for other occurences of "cached" with much effort, but found at least one other reference in src.con(5). Both are fixed in the attached patch, which I'd like to commit (after re approval) to -CURRENT. BTW: There appear to be broken man page related entries in Obsoletefiles.inc (perhaps because of a line length limit in the case of the latter two files in the following list???): OLD_FILES+=usr/share/man/man5/cached.conf.5 OLD_FILES+=usr/share/man/man8/cached.8 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3. OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3 This should probably be fixed at the same time ... (I do not attach a patch, but in case of the obsolete files the fix is obviously to add the missing ".gz" extension to each line ...) Regards, STefan PS: I have decided to CC re@ and to consider this mail as a request for approval, since I do not think that there is much debate and there seems to be only one way to fix this ;-) Index: share/man/man5/nsswitch.conf.5 =================================================================== RCS file: /usr/cvs/src/share/man/man5/nsswitch.conf.5,v retrieving revision 1.17 diff -u -r1.17 nsswitch.conf.5 --- share/man/man5/nsswitch.conf.5 22 Jan 2007 11:45:25 -0000 1.17 +++ share/man/man5/nsswitch.conf.5 7 Oct 2007 10:12:27 -0000 @@ -95,7 +95,7 @@ If this is present, it must be the only source for that entry. .It cache makes use of the -.Xr cached 8 +.Xr nscd 8 daemon. .El .Ss Databases @@ -218,17 +218,17 @@ .Xr nsswitch.conf 5 file. You should also enable caching for this database in -.Xr cached.conf 5 . +.Xr nscd.conf 5 . If for the particular query .Dq cache source returns success, no further sources are queried. -On the other hand, if there are no previously cached data, the +On the other hand, if there are no previously nscd data, the query result will be placed into the cache right after all other sources are processed. Note, that .Dq cache requires -.Xr cached 8 +.Xr nscd 8 daemon to be running. .Ss Compat mode: +/- syntax In historical multi-source implementations, the @@ -353,9 +353,9 @@ databases. .Sh SEE ALSO .Xr nsdispatch 3 , -.Xr cached.conf 5 , +.Xr nscd.conf 5 , .Xr resolv.conf 5 , -.Xr cached 8 , +.Xr nscd 8 , .Xr named 8 , .Xr ypbind 8 .Sh HISTORY Index: share/man/man5/src.conf.5 =================================================================== RCS file: /usr/cvs/src/share/man/man5/src.conf.5,v retrieving revision 1.15 diff -u -r1.15 src.conf.5 --- share/man/man5/src.conf.5 27 Aug 2007 20:22:59 -0000 1.15 +++ share/man/man5/src.conf.5 7 Oct 2007 10:40:23 -0000 @@ -440,7 +440,7 @@ .Pa nsswitch subsystem. The generic caching daemon, -.Xr cached 8 , +.Xr nscd 8 , will not be built either if this option is set. .It Va WITHOUT_OBJC .\" from FreeBSD: src/tools/build/options/WITHOUT_OBJC,v 1.1 2006/03/21 07:50:50 ru Exp