update from main archive 961011

Fri Oct 11 19:13:34 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/Makefile (CPPFLAGS): Set CHARMAP_PATH to
 	"$(i18ndir)/charmaps".

Fri Oct 11 22:12:41 1996  NIIBE Yutaka  <gniibe@mri.co.jp>

	* sysdeps/unix/sysv/linux/sys/procfs.h: Include <asm/user.h>
	to get definition of FPU description struct.

	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=socket] (subdir_headers):
	Add net/if.h, net/if_ppp.h, net/ppp-comp.h, net/ppp_defs.h,
 	net/if_arp.h, and net/route.h.
	* sysdeps/unix/sysv/linux/net/if_arp.h: New file.
	* sysdeps/unix/sysv/linux/net/route.h: New file.

Fri Oct 11 14:49:13 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/stub/readdir_r.c: New file.  We need a stub version.
	* sysdeps/stub/e_acosl.c: Likewise.
	* sysdeps/stub/e_asinl.c: Likewise.
	* sysdeps/stub/e_atan2l.c: Likewise.
	* sysdeps/stub/e_expl.c: Likewise.
	* sysdeps/stub/e_fmodl.c: Likewise.
	* sysdeps/stub/e_log10l.c: Likewise.
	* sysdeps/stub/e_logl.c: Likewise.
	* sysdeps/stub/e_sqrtl.c: Likewise.
	* sysdeps/stub/s_atanl.c: Likewise.
	* sysdeps/stub/s_log1pl.c: Likewise.

	* Makefile (distribute): Add nsswitch.h and netgroup.h.

	* nss/Makefile (generated): db-netgrp.c is not generated.

	* sysdeps/alpha/Dist: Add stxcpy.S and stxncpy.S.

	* Make-dist (+out): Add $(dont_distribute).

Fri Oct 11 00:27:18 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* stdio-common/Makefile (routines): Add tmpnam_r.

Fri Oct 11 05:32:51 1996  Ulrich Drepper  <drepper@cygnus.com>

	* version.h: Bump version to 1.96.

Fri Oct 11 18:13:47 1996  Andreas Jaeger  <aj@arthur.pfalz.de>

	* stdio-common/tst-printf.c: Some more cleanups.

Fri Oct 11 02:48:02 1996  Ulrich Drepper  <drepper@cygnus.com>

	* resolv/arpa/nameser.h: Update from bind-4.9.5-T6B.
	* resolv/resolv.h: Likewise.
	* resolv/gethnamaddr.c: Likewise.
	* resolv/res_comp.c: Likewise.
	* resolv/res_debug.c: Likewise.
	* resolv/res_init.c: Likewise.
	* resolv/res_send.c: Likewise.
	* resolv/Banner: Update version number.

	* nss/nss_dns/dns-host.c: Update according to change in
	resolv/gethnamaddr.c.

Fri Oct 10 20:52:28 1996  Ralph Loader  <loader@maths.ox.ac.uk>

	* crypt/md5.c (md5_stream): When reading the block in several
	pieces append to instead of replace previously read data.

Thu Oct 10 15:53:17 1996  Richard Henderson  <rth@tamu.edu>

	* sysdeps/alpha/stxcpy.S ($unaligned): In single word copy, correct
	last-byte-written bit for source word misalignment.
	* sysdeps/alpha/strchr.c: Removed.  There is now an assembler
 	version.

Thu Oct 10 17:17:23 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sunrpc/Makefile (rpcsvc): Remove yp.x.  The corrected version
	comes with glibc-nis.
	* sunrpc/rpcsvc/yp.x: Removed.

	* nss/nss_files/files-netgr.c (_nss_netgroup_parseline): Test
	for *CURSOR to be NULL and dump a core if yes.

Thu Oct  9 20:09:53 1996  Matthew Jacob  <mjacob@feral.com>

	* sysdeps/unix/sysv/linux/alpha/brk.S: Define _ERRNO_H before
	including <errnos.h> to get error numbers.

Thu Oct 10 14:00:01 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/i386/sigcontext.h: Moved file...
	* sysdeps/unix/sysv/linux/sigcontext.h: ...to here.  So the
	Alpha people find a correct file.
	* sysdeps/libm-ieee754/w_cabs.c: We cannot make __cabsl simply
	an alias of __cabs since the structures have different names.
	* sysdeps/libm-ieee754/w_log10.c: Fix typo in weak_alias.
	Reported by Matthew Jacob <mjacob@feral.com>.

	simply a wrapper around the <linux/elfcore.h> file since the

3 files changed, 4 insertions, 293 deletions

diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index efad599716..7612f1a567 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -50,7 +50,7 @@ headers = $(addprefix rpc/,auth.h auth_unix.h clnt.h netdb.h pmap_clnt.h \
 	  $(rpcsvc:%=rpcsvc/%) $(rpcsvc:%.x=rpcsvc/%.h)
 rpcsvc = bootparam.x nlm_prot.x rstat.x \
 	 yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
-	 rnusers.x spray.x nfs_prot.x rquota.x yp.x
+	 rnusers.x spray.x nfs_prot.x rquota.x
 install-others = $(includedir)/rpcsvc/bootparam_prot.h \
 		 $(sysconfdir)/rpc
 generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c)
diff --git a/sunrpc/rpcsvc/yp.x b/sunrpc/rpcsvc/yp.x
deleted file mode 100644
index 8fe70a2706..0000000000
--- a/sunrpc/rpcsvc/yp.x
+++ /dev/null
@@ -1,291 +0,0 @@
-/* @(#)yp.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * Protocol description file for the Yellow Pages Service
- */
-
-const YPMAXRECORD = 1024;
-const YPMAXDOMAIN = 64;
-const YPMAXMAP = 64;
-const YPMAXPEER = 64;
-
-
-enum ypstat {
-	YP_TRUE		=  1,
-	YP_NOMORE	=  2,
-	YP_FALSE	=  0,
-	YP_NOMAP	= -1,
-	YP_NODOM	= -2,
-	YP_NOKEY	= -3,
-	YP_BADOP	= -4,
-	YP_BADDB	= -5,
-	YP_YPERR	= -6,
-	YP_BADARGS	= -7,
-	YP_VERS		= -8
-};
-
-
-enum ypxfrstat {
-	YPXFR_SUCC	=  1,
-	YPXFR_AGE	=  2,
-	YPXFR_NOMAP	= -1,
-	YPXFR_NODOM	= -2,
-	YPXFR_RSRC	= -3,
-	YPXFR_RPC	= -4,
-	YPXFR_MADDR	= -5,
-	YPXFR_YPERR	= -6,
-	YPXFR_BADARGS	= -7,
-	YPXFR_DBM	= -8,
-	YPXFR_FILE	= -9,
-	YPXFR_SKEW	= -10,
-	YPXFR_CLEAR	= -11,
-	YPXFR_FORCE	= -12,
-	YPXFR_XFRERR	= -13,
-	YPXFR_REFUSED	= -14
-};
-
-
-typedef string domainname<YPMAXDOMAIN>;
-typedef string mapname<YPMAXMAP>;
-typedef string peername<YPMAXPEER>;
-typedef opaque keydat<YPMAXRECORD>;
-typedef opaque valdat<YPMAXRECORD>;
-
-
-struct ypmap_parms {
-	domainname domain;	
-	mapname map;
-	unsigned int ordernum;
-	peername peer;
-};
-
-struct ypreq_key {
-	domainname domain;
-	mapname map;
-	keydat key;
-};
-
-struct ypreq_nokey {
-	domainname domain;	
-	mapname map;
-};
-	
-struct ypreq_xfr {
-	ypmap_parms map_parms;
-	unsigned int transid;
-	unsigned int prog;
-	unsigned int port;
-};
-
-
-struct ypresp_val {
-	ypstat stat;
-	valdat val;
-};
-
-struct ypresp_key_val {
-	ypstat stat;
-	keydat key;
-	valdat val;
-};
-
-
-struct ypresp_master {
-	ypstat stat;	
-	peername peer;
-};
-
-struct ypresp_order {
-	ypstat stat;
-	unsigned int ordernum;
-};
-
-union ypresp_all switch (bool more) {
-case TRUE:
-	ypresp_key_val val;
-case FALSE:
-	void;
-};
-
-struct ypresp_xfr {
-	unsigned int transid;
-	ypxfrstat xfrstat;
-};
-
-struct ypmaplist {
-	mapname map;
-	ypmaplist *next;
-};
-
-struct ypresp_maplist {
-	ypstat stat;
-	ypmaplist *maps;
-};
-
-enum yppush_status {
-	YPPUSH_SUCC	=  1,	/* Success */
-	YPPUSH_AGE 	=  2,	/* Master's version not newer */
-	YPPUSH_NOMAP	= -1,	/* Can't find server for map */
-	YPPUSH_NODOM	= -2,	/* Domain not supported */
-	YPPUSH_RSRC	= -3,	/* Local resource alloc failure */
-	YPPUSH_RPC	= -4,	/* RPC failure talking to server */
-	YPPUSH_MADDR 	= -5,	/* Can't get master address */
-	YPPUSH_YPERR	= -6,	/* YP server/map db error */
-	YPPUSH_BADARGS	= -7,	/* Request arguments bad */
-	YPPUSH_DBM	= -8,	/* Local dbm operation failed */
-	YPPUSH_FILE	= -9,	/* Local file I/O operation failed */
-	YPPUSH_SKEW	= -10,	/* Map version skew during transfer */
-	YPPUSH_CLEAR	= -11,	/* Can't send "Clear" req to local ypserv */
-	YPPUSH_FORCE	= -12,	/* No local order number in map  use -f flag. */
-	YPPUSH_XFRERR 	= -13,	/* ypxfr error */
-	YPPUSH_REFUSED	= -14 	/* Transfer request refused by ypserv */
-};
-
-struct yppushresp_xfr {
-	unsigned transid;
-	yppush_status status;
-};
-
-/*
- * Response structure and overall result status codes.  Success and failure
- * represent two separate response message types.
- */
- 
-enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1, 
-	YPBIND_FAIL_VAL = 2
-};
- 
-struct ypbind_binding {
-    opaque ypbind_binding_addr[4]; /* In network order */
-    opaque ypbind_binding_port[2]; /* In network order */
-};   
-
-union ypbind_resp switch (ypbind_resptype ypbind_status) {
-case YPBIND_FAIL_VAL:
-        unsigned ypbind_error;
-case YPBIND_SUCC_VAL:
-        ypbind_binding ypbind_bindinfo;
-};     
-
-/* Detailed failure reason codes for response field ypbind_error*/
- 
-const YPBIND_ERR_ERR    = 1;	/* Internal error */
-const YPBIND_ERR_NOSERV = 2;	/* No bound server for passed domain */
-const YPBIND_ERR_RESC   = 3;	/* System resource allocation failure */
- 
- 
-/*
- * Request data structure for ypbind "Set domain" procedure.
- */
-struct ypbind_setdom {
-	domainname ypsetdom_domain;
-	ypbind_binding ypsetdom_binding;
-	unsigned ypsetdom_vers;
-};
-
-
-/*
- * YP access protocol
- */
-program YPPROG {
-	version YPVERS {
-		void 
-		YPPROC_NULL(void) = 0;
-
-		bool 
-		YPPROC_DOMAIN(domainname) = 1;	
-
-		bool
-		YPPROC_DOMAIN_NONACK(domainname) = 2;
-
-		ypresp_val
-		YPPROC_MATCH(ypreq_key) = 3;
-
-		ypresp_key_val 
-		YPPROC_FIRST(ypreq_key) = 4;
-
-		ypresp_key_val 
-		YPPROC_NEXT(ypreq_key) = 5;
-
-		ypresp_xfr
-		YPPROC_XFR(ypreq_xfr) = 6;
-
-		void
-		YPPROC_CLEAR(void) = 7;
-
-		ypresp_all
-		YPPROC_ALL(ypreq_nokey) = 8;
-
-		ypresp_master
-		YPPROC_MASTER(ypreq_nokey) = 9;
-
-		ypresp_order
-		YPPROC_ORDER(ypreq_nokey) = 10;
-
-		ypresp_maplist 
-		YPPROC_MAPLIST(domainname) = 11;
-	} = 2;
-} = 100004;
-
-
-/*
- * YPPUSHPROC_XFRRESP is the callback routine for result of YPPROC_XFR
- */
-program YPPUSH_XFRRESPPROG {
-	version YPPUSH_XFRRESPVERS {
-		void
-		YPPUSHPROC_NULL(void) = 0;
-
-		yppushresp_xfr	
-		YPPUSHPROC_XFRRESP(void) = 1;
-	} = 1;
-} = 0x40000000;	/* transient: could be anything up to 0x5fffffff */
-
-
-/*
- * YP binding protocol
- */
-program YPBINDPROG {
-	version YPBINDVERS {
-		void
-		YPBINDPROC_NULL(void) = 0;
-	
-		ypbind_resp
-		YPBINDPROC_DOMAIN(domainname) = 1;
-
-		void
-		YPBINDPROC_SETDOM(ypbind_setdom) = 2;
-	} = 2;
-} = 100007;
-
-
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 7c3a31b79e..c9efc97024 100644
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -46,7 +46,9 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
-#define MAX(a, b)     ((a > b) ? a : b)
+#ifndef MAX
+# define MAX(a, b)     ((a > b) ? a : b)
+#endif
 
 static bool_t		svcudp_recv();
 static bool_t		svcudp_reply();