Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Oct 2004 23:46:00 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 63267 for review
Message-ID:  <200410162346.i9GNk0MJ041365@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63267

Change 63267 by peter@peter_overcee on 2004/10/16 23:45:02

	IFC @63266

Affected files ...

.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#6 integrate
.. //depot/projects/hammer/contrib/gcc/c-ppoutput.c#2 integrate
.. //depot/projects/hammer/etc/mtree/BSD.var.dist#7 integrate
.. //depot/projects/hammer/etc/rc.d/ugidfw#2 integrate
.. //depot/projects/hammer/lib/libc/gmon/gmon.c#7 integrate
.. //depot/projects/hammer/lib/libc/gmon/mcount.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/auth_des.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/auth_none.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/auth_unix.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/authunix_prot.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/bindresvport.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_bcast.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_dg.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_generic.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_perror.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_raw.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_simple.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/des_crypt.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/des_soft.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/getnetconfig.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/getnetpath.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/getpublickey.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/getrpcport.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/key_call.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/key_prot_xdr.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/mt_misc.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/netname.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/netnamer.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/pmap_clnt.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/pmap_getmaps.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/pmap_getport.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/pmap_prot.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/pmap_prot2.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/pmap_rmt.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_callmsg.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_dtablesize.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_prot.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpcb_prot.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpcdname.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_auth.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_dg.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_generic.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_raw.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_run.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/svc_vc.c#7 integrate
.. //depot/projects/hammer/lib/libc/stdio/printf.3#9 integrate
.. //depot/projects/hammer/lib/libc/string/strlcat.c#4 integrate
.. //depot/projects/hammer/lib/libc/string/strlcpy.c#4 integrate
.. //depot/projects/hammer/lib/libc/sys/read.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/sendfile.2#9 integrate
.. //depot/projects/hammer/lib/libc/sys/write.2#6 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr.c#2 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_array.c#2 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_float.c#5 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_mem.c#3 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_rec.c#4 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_reference.c#2 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr_stdio.c#3 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#17 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/early-adopter/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/early-adopter/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/Makefile.inc#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/hw.ent#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/Makefile.inc#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/alpha/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/amd64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.ent#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/layout.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/i386/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/i386/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/ia64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/pc98/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/readme/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/readme/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/share/sgml/catalog#1 branch
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/share/sgml/release.dsl#1 branch
.. //depot/projects/hammer/share/colldef/Makefile#16 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#26 integrate
.. //depot/projects/hammer/share/man/man4/ubsa.4#5 integrate
.. //depot/projects/hammer/share/man/man5/disktab.5#5 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#26 integrate
.. //depot/projects/hammer/share/numericdef/el_GR.ISO8859-7.src#2 integrate
.. //depot/projects/hammer/share/timedef/Makefile#16 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#12 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#30 integrate
.. //depot/projects/hammer/sys/boot/common/help.common#11 integrate
.. //depot/projects/hammer/sys/boot/common/loader.8#16 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/hammer/sys/dev/digi/digi.h#7 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#20 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#13 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751var.h#5 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#25 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mss.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#8 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#25 integrate
.. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ubsa.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#50 integrate
.. //depot/projects/hammer/sys/geom/label/g_label.c#8 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#12 integrate
.. //depot/projects/hammer/sys/i386/bios/apm.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/nexus.c#15 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#32 integrate
.. //depot/projects/hammer/sys/i386/isa/npx.c#21 integrate
.. //depot/projects/hammer/sys/ia64/ia64/nexus.c#5 integrate
.. //depot/projects/hammer/sys/isa/atkbdc_isa.c#7 integrate
.. //depot/projects/hammer/sys/isa/isahint.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#44 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#28 integrate
.. //depot/projects/hammer/sys/kern/tty.c#30 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#22 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#27 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#23 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#33 integrate
.. //depot/projects/hammer/sys/sys/proc.h#69 integrate
.. //depot/projects/hammer/sys/sys/ttydefaults.h#6 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#6 integrate
.. //depot/projects/hammer/usr.bin/login/login.1#5 integrate

Differences ...

==== //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#6 (text+ko) ====

@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $
-.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.10 2004/07/06 13:16:46 mbr Exp $
+.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.11 2004/10/15 12:50:05 trhodes Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
@@ -64,9 +64,8 @@
 .Nm
 utility takes a set of system configuration information, and generates
 a coordinated set of
-.I amd
-,
-.I mount
+.Xr amd 8 ,
+.Xr mount 8
 and
 .Xr mountd 8
 configuration files.

==== //depot/projects/hammer/contrib/gcc/c-ppoutput.c#2 (text+ko) ====

@@ -292,7 +292,7 @@
 	  const cpp_string *str)
 {
   maybe_print_line (print.map, line);
-  fprintf (print.outf, "#ident \"%s\"\n", str->text);
+  fprintf (print.outf, "#ident %s\n", str->text);
   print.line++;
 }
 

==== //depot/projects/hammer/etc/mtree/BSD.var.dist#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.70 2004/09/28 09:46:00 dougb Exp $
+# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.71 2004/10/15 08:57:24 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -47,7 +47,7 @@
     ..
     msgs            uname=daemon
     ..
-    named           uname=root
+    named
     ..
     preserve
     ..

==== //depot/projects/hammer/etc/rc.d/ugidfw#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ugidfw,v 1.1 2004/09/29 00:12:28 trhodes Exp $
+# $FreeBSD: src/etc/rc.d/ugidfw,v 1.2 2004/10/14 04:37:57 trhodes Exp $
 
 # PROVIDE: ugidfw
 # REQUIRE:
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
 
 . /etc/rc.subr
 

==== //depot/projects/hammer/lib/libc/gmon/gmon.c#7 (text+ko) ====

@@ -31,11 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && defined(LIBC_SCCS)
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.19 2004/09/10 05:44:17 kuriyama Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.20 2004/10/16 06:32:43 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>

==== //depot/projects/hammer/lib/libc/gmon/mcount.c#3 (text+ko) ====

@@ -31,11 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
+#if !defined(_KERNEL) && defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.19 2004/01/06 18:49:54 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.20 2004/10/16 06:32:43 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>

==== //depot/projects/hammer/lib/libc/rpc/auth_des.c#2 (text+ko) ====

@@ -54,10 +54,10 @@
 #include "un-namespace.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI"; */
+static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.8 2002/03/22 23:18:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
 
 #define USEC_PER_SEC		1000000
 #define RTIME_TIMEOUT		5	/* seconds to wait for sync */

==== //depot/projects/hammer/lib/libc/rpc/auth_none.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.12 2002/03/22 23:18:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * auth_none.c

==== //depot/projects/hammer/lib/libc/rpc/auth_unix.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.15 2002/03/22 23:18:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * auth_unix.c, Implements UNIX style authentication parameters.

==== //depot/projects/hammer/lib/libc/rpc/authunix_prot.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.8 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * authunix_prot.c

==== //depot/projects/hammer/lib/libc/rpc/bindresvport.c#2 (text+ko) ====

@@ -30,12 +30,12 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/
-/*static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";*/
-/*from: OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp */
+static char *sccsid2 = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";
+static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";
 #endif
+/* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.15 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1987 by Sun Microsystems, Inc.

==== //depot/projects/hammer/lib/libc/rpc/clnt_bcast.c#3 (text+ko) ====

@@ -32,13 +32,12 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
  */
 
-/* #ident	"@(#)clnt_bcast.c	1.18	94/05/03 SMI" */
-
-#if !defined(lint) && defined(SCCSIDS)
+#if defined(LIBC_SCCS) && !defined(lint)
+#ident	"@(#)clnt_bcast.c	1.18	94/05/03 SMI"
 static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.7 2003/01/27 22:43:23 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
 
 
 /*

==== //depot/projects/hammer/lib/libc/rpc/clnt_dg.c#4 (text+ko) ====

@@ -32,13 +32,12 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
  */
 
-/* #ident	"@(#)clnt_dg.c	1.23	94/04/22 SMI" */
-
-#if !defined(lint) && defined(SCCSIDS)
+#if defined(LIBC_SCCS) && !defined(lint)
+#ident	"@(#)clnt_dg.c	1.23	94/04/22 SMI"
 static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.16 2003/10/29 09:25:07 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Implements a connectionless client side RPC.

==== //depot/projects/hammer/lib/libc/rpc/clnt_generic.c#2 (text+ko) ====

@@ -49,11 +49,11 @@
 /* #ident	"@(#)clnt_generic.c	1.40	99/04/21 SMI" */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";*/
-/*static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";*/
+static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
+static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.14 2002/07/11 16:23:04 alfred Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc.

==== //depot/projects/hammer/lib/libc/rpc/clnt_perror.c#2 (text+ko) ====

@@ -31,11 +31,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.16 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_perror.c

==== //depot/projects/hammer/lib/libc/rpc/clnt_raw.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.18 2002/07/14 23:14:02 alfred Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.19 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_raw.c

==== //depot/projects/hammer/lib/libc/rpc/clnt_simple.c#3 (text+ko) ====

@@ -33,11 +33,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.18 2003/10/29 09:18:44 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.19 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_simple.c

==== //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#3 (text+ko) ====

@@ -30,12 +30,12 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
-static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
+static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.16 2004/08/13 23:22:38 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
  
 /*
  * clnt_tcp.c, Implements a TCP/IP based, client side RPC.

==== //depot/projects/hammer/lib/libc/rpc/des_crypt.c#2 (text+ko) ====

@@ -35,13 +35,11 @@
 #include <rpc/des_crypt.h>
 #include <rpc/des.h>
 
-#if 0
-#ifndef lint
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
 #endif
-#endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.7 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
 
 static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;

==== //depot/projects/hammer/lib/libc/rpc/des_soft.c#2 (text+ko) ====

@@ -1,9 +1,3 @@
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.2 2002/03/22 23:18:36 obrien Exp $");
-
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -32,6 +26,13 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.3 2004/10/16 06:11:34 obrien Exp $");
+
 /*
  * Table giving odd parity in the low bit for ASCII characters
  */

==== //depot/projects/hammer/lib/libc/rpc/getnetconfig.c#4 (text+ko) ====

@@ -29,13 +29,12 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-/*
-#ifndef lint
-static        char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
 #endif
-*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.10 2004/03/05 08:10:17 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.11 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.

==== //depot/projects/hammer/lib/libc/rpc/getnetpath.c#3 (text+ko) ====

@@ -29,13 +29,12 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-/*
-#ifndef lint
-static        char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
 #endif
-*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.4 2003/01/27 22:36:53 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.

==== //depot/projects/hammer/lib/libc/rpc/getpublickey.c#2 (text+ko) ====

@@ -27,11 +27,12 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
+
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.6 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.7 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * publickey.c

==== //depot/projects/hammer/lib/libc/rpc/getrpcport.c#2 (text+ko) ====

@@ -29,13 +29,12 @@
  * Mountain View, California  94043
  */
 
-#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)getrpcport.c 1.3 87/08/11 SMI";
+static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 static char *sccsid = "@(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.12 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1985 by Sun Microsystems, Inc.

==== //depot/projects/hammer/lib/libc/rpc/key_call.c#2 (text+ko) ====

@@ -31,9 +31,8 @@
  */
 
 #ident	"@(#)key_call.c	1.25	94/04/24 SMI"
-
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.14 2002/07/14 23:20:08 alfred Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * key_call.c, Interface to keyserver

==== //depot/projects/hammer/lib/libc/rpc/key_prot_xdr.c#2 (text+ko) ====

@@ -34,11 +34,11 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
 /* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
 
+/* #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.4 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
 
 /* 
  * Compiled from key_prot.x using rpcgen.

==== //depot/projects/hammer/lib/libc/rpc/mt_misc.c#3 (text+ko) ====

@@ -1,9 +1,8 @@
 /*	$NetBSD: mt_misc.c,v 1.1 2000/06/02 23:11:11 fvdl Exp $	*/
 
 /* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
-
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.5 2003/02/16 17:29:10 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.6 2004/10/16 06:11:34 obrien Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"

==== //depot/projects/hammer/lib/libc/rpc/netname.c#2 (text+ko) ====

@@ -27,11 +27,12 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
+
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.7 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.8 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * netname utility routines

==== //depot/projects/hammer/lib/libc/rpc/netnamer.c#2 (text+ko) ====

@@ -27,11 +27,13 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
+
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.9 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.10 2004/10/16 06:11:35 obrien Exp $");
+
 /*
  * netname utility routines convert from unix names to network names and
  * vice-versa This module is operating system dependent! What we define here

==== //depot/projects/hammer/lib/libc/rpc/pmap_clnt.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.14 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_clnt.c

==== //depot/projects/hammer/lib/libc/rpc/pmap_getmaps.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.15 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.16 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_getmap.c

==== //depot/projects/hammer/lib/libc/rpc/pmap_getport.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.14 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_getport.c

==== //depot/projects/hammer/lib/libc/rpc/pmap_prot.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.8 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.9 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_prot.c

==== //depot/projects/hammer/lib/libc/rpc/pmap_prot2.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.9 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.10 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_prot2.c

==== //depot/projects/hammer/lib/libc/rpc/pmap_rmt.c#2 (text+ko) ====

@@ -29,13 +29,12 @@
  * Mountain View, California  94043
  */
 
-#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.19 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.20 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_rmt.c

==== //depot/projects/hammer/lib/libc/rpc/rpc_callmsg.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.11 2002/03/22 23:18:36 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpc_callmsg.c

==== //depot/projects/hammer/lib/libc/rpc/rpc_dtablesize.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
+static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 static char *sccsid = "@(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.14 2002/03/22 23:18:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 #include "namespace.h"
 #include <unistd.h>

==== //depot/projects/hammer/lib/libc/rpc/rpc_prot.c#2 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.11 2002/03/22 23:18:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpc_prot.c

==== //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#4 (text+ko) ====

@@ -38,11 +38,11 @@
  * California.
  */
 
-#if !defined(lint) && defined(SCCSIDS)
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.13 2003/05/01 19:03:14 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
 
 #ifdef PORTMAP
 /*

==== //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#4 (text+ko) ====

@@ -52,11 +52,11 @@
 /* #ident	"@(#)rpcb_clnt.c	1.27	94/04/24 SMI" */
 
 
-#if !defined(lint) && defined(SCCSIDS)
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.13 2003/10/29 09:22:49 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcb_clnt.c

==== //depot/projects/hammer/lib/libc/rpc/rpcb_prot.c#3 (text+ko) ====

@@ -34,11 +34,11 @@
 
 /* #ident	"@(#)rpcb_prot.c	1.13	94/04/24 SMI" */
 
-#if !defined(lint) && defined(SCCSIDS)
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.4 2004/02/10 20:40:17 cperciva Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcb_prot.c

==== //depot/projects/hammer/lib/libc/rpc/rpcdname.c#2 (text+ko) ====

@@ -27,11 +27,12 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
+
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.4 2002/03/22 23:18:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcdname.c

==== //depot/projects/hammer/lib/libc/rpc/svc.c#3 (text+ko) ====

@@ -30,11 +30,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.22 2003/01/16 07:13:51 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.23 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc.c, Server-side remote procedure call interface.

==== //depot/projects/hammer/lib/libc/rpc/svc_auth.c#2 (text+ko) ====

@@ -32,13 +32,12 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
  */
 
-/* #ident	"@(#)svc_auth.c	1.16	94/04/24 SMI" */
-
-#if !defined(lint) && defined(SCCSIDS)
+#if defined(LIBC_SCCS) && !defined(lint)
+#ident	"@(#)svc_auth.c	1.16	94/04/24 SMI"
 static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.11 2002/03/22 23:18:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_auth.c, Server-side rpc authenticator interface.

==== //depot/projects/hammer/lib/libc/rpc/svc_auth_unix.c#2 (text+ko) ====

@@ -28,11 +28,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
+static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.10 2002/03/22 23:18:37 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.11 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_auth_unix.c

==== //depot/projects/hammer/lib/libc/rpc/svc_dg.c#3 (text+ko) ====

@@ -33,9 +33,11 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  */
 
-/* #ident	"@(#)svc_dg.c	1.17	94/04/24 SMI" */
+#if defined(LIBC_SCCS) && !defined(lint)
+#ident	"@(#)svc_dg.c	1.17	94/04/24 SMI"
+#endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.6 2003/01/27 22:46:50 mbr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.7 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_dg.c, Server side for connectionless RPC.

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410162346.i9GNk0MJ041365>