From owner-cvs-lib Tue May 27 22:07:24 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id WAA24464 for cvs-lib-outgoing; Tue, 27 May 1997 22:07:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id WAA24382; Tue, 27 May 1997 22:05:48 -0700 (PDT) From: Bill Paul Received: (from wpaul@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id WAA11877; Tue, 27 May 1997 22:05:39 -0700 (PDT) Date: Tue, 27 May 1997 22:05:39 -0700 (PDT) Message-Id: <199705280505.WAA11877@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-lib@FreeBSD.ORG Subject: cvs commit: src/lib/libc/rpc Makefile.inc auth_des.c auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c clnt_udp.c clnt_unix.c crypt_client.c des_crypt.c get_myaddress.c getrpcent.3 ... Sender: owner-cvs-lib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wpaul 1997/05/27 22:05:39 PDT Modified files: lib/libc/rpc Makefile.inc auth_des.c auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c clnt_udp.c clnt_unix.c crypt_client.c des_crypt.c get_myaddress.c getrpcent.3 getrpcent.c getrpcport.c pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_callmsg.c rpc_commondata.c rpc_dtablesize.c rpc_prot.c rtime.c svc.c svc_auth.c svc_auth_des.c svc_auth_unix.c svc_raw.c svc_run.c svc_simple.c svc_tcp.c svc_udp.c svc_unix.c Log: Resolve conflicts. This concludes tonight's entertainment. Once I'm sure I haven't destroyed the world with all these changes, I'll import the utilities. Everything should continue to work as before. If it doesn't let me know. Special thanks to Mark Murray for running a test 'make world' for me to shake out the bugs, which, hopefully, I have fixed. (And there was much rejoicing.) Revision Changes Path 1.8 +26 -2 src/lib/libc/rpc/Makefile.inc 1.2 +0 -0 src/lib/libc/rpc/auth_des.c 1.8 +1 -1 src/lib/libc/rpc/auth_none.c 1.10 +1 -1 src/lib/libc/rpc/auth_unix.c 1.5 +1 -1 src/lib/libc/rpc/authunix_prot.c 1.9 +1 -1 src/lib/libc/rpc/bindresvport.c 1.8 +19 -2 src/lib/libc/rpc/clnt_generic.c 1.9 +1 -1 src/lib/libc/rpc/clnt_perror.c 1.9 +1 -1 src/lib/libc/rpc/clnt_raw.c 1.9 +1 -1 src/lib/libc/rpc/clnt_simple.c 1.10 +87 -2 src/lib/libc/rpc/clnt_tcp.c 1.11 +92 -3 src/lib/libc/rpc/clnt_udp.c 1.2 +0 -0 src/lib/libc/rpc/clnt_unix.c 1.2 +0 -0 src/lib/libc/rpc/crypt_client.c 1.2 +0 -0 src/lib/libc/rpc/des_crypt.c 1.11 +3 -5 src/lib/libc/rpc/get_myaddress.c 1.7 +1 -1 src/lib/libc/rpc/getrpcent.3 1.9 +1 -1 src/lib/libc/rpc/getrpcent.c 1.9 +1 -1 src/lib/libc/rpc/getrpcport.c 1.8 +35 -11 src/lib/libc/rpc/pmap_clnt.c 1.8 +1 -1 src/lib/libc/rpc/pmap_getmaps.c 1.7 +1 -1 src/lib/libc/rpc/pmap_getport.c 1.5 +1 -1 src/lib/libc/rpc/pmap_prot.c 1.6 +1 -1 src/lib/libc/rpc/pmap_prot2.c 1.12 +1 -1 src/lib/libc/rpc/pmap_rmt.c 1.8 +1 -1 src/lib/libc/rpc/rpc_callmsg.c 1.6 +1 -1 src/lib/libc/rpc/rpc_commondata.c 1.9 +1 -1 src/lib/libc/rpc/rpc_dtablesize.c 1.7 +1 -1 src/lib/libc/rpc/rpc_prot.c 1.2 +0 -0 src/lib/libc/rpc/rtime.c 1.12 +1 -3 src/lib/libc/rpc/svc.c 1.6 +122 -28 src/lib/libc/rpc/svc_auth.c 1.2 +0 -0 src/lib/libc/rpc/svc_auth_des.c 1.7 +14 -3 src/lib/libc/rpc/svc_auth_unix.c 1.6 +1 -1 src/lib/libc/rpc/svc_raw.c 1.8 +2 -2 src/lib/libc/rpc/svc_run.c 1.8 +2 -1 src/lib/libc/rpc/svc_simple.c 1.11 +1 -1 src/lib/libc/rpc/svc_tcp.c 1.10 +1 -1 src/lib/libc/rpc/svc_udp.c 1.2 +0 -0 src/lib/libc/rpc/svc_unix.c