update from main archive 970202 cvs/libc-970203

1997-02-03 02:33  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-deps.c (_dl_map_object_deps): Handle multiple AUXILIARY
	entries.  This is still no complete implementation since AUXILIARY
	entries in other shared objects are not yet handled.

	* libio/libio.h (_IO_cookie_io_functions_t): Move to C++ protected
	place.

	* po/es.po: Update.
	* po/fr.po: Update.
	* po/nl.po: Update.

	* time/Makefile: Better cross-compile support.  Avoid test which
	cannot be run.
	(CFLAGS-tzset.c): New variable.  Overwrite TZDEFAULT value from
	tzfile.h file.
	* time/tzfile.c (__tzfile_read): Allow TZDEFAULT start with '/' even
	in SUID programs.
	* time/tzset.c (__tzset_internal): If TZ envvar is not set use same
	default values as in tzfile.c.

	* elf/dynamic-link.h (elf_get_dynamic_info): Recognize versioning
	tags.
	* elf/link.h: Likewise.
	* elf/elf.h: Add tag definitions and data structures for versioning.

1997-02-03 02:17  Ulrich Drepper  <drepper@cygnus.com>

	* nis/rpcsvc/yp.x (struct ypresp_key_val): There is not stupid
	"Sun bug".  This is the order of elements also used by 4.4BSD.
	* nis/rpcsvc/yp.h: Likewise.
	Reported by HJ Lu.

1997-02-02 12:13  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* sunrpc/Makefile ($(objpfx)x%.h, $(objpfx)x%.c): Add "@:" as
	action.

	* Makefile (install): Pass installation directories as arguments
	to ldconfig.

1997-02-02 23:15  Ulrich Drepper  <drepper@cygnus.com>

	* malloc/malloc.c (__after_morecore_hook): New variable.
	(malloc_extend_top): Call __after_morecore_hook if set.
	(main_trim): Likewise.
	* malloc/malloc.h: Add declaration of __after_morecore_hook.
	Suggested by Marcus Daniels.

1997-02-02 23:00  Marcus G. Daniels  <marcus@tdb.com>

	* malloc/malloc.c (rEALLOc): Protect tsd_setspecific call by
	#ifndef NO_THREADS.
	(mallinfo): Likewise.

	* malloc/malloc.c (__morecore): Make external since it is used in
	programs.

1997-02-02 15:10  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/statbuf.h (struct stat): Make st_dev field
	unsigned.

1997-02-01 23:36  Richard Henderson  <rth@tamu.edu>

	* sysdeps/alpha/stxncpy.S ($unaligned) [src % 8 > dst % 8]: Don't
	use t6 as a temporary; it contains bits we still need in $u_head.

1997-01-31 15:05  John Bowman  <bowman@ipp-garching.mpg.de>

	* sysdeps/i386/fpu/__math.h [__USE_MISC]: Don't declare prototypes
	using __ prefix.  Add prototype for log1p.

2 files changed, 137 insertions, 144 deletions

diff --git a/nis/rpcsvc/yp.h b/nis/rpcsvc/yp.h
index f625eced50..0bee83b259 100644
--- a/nis/rpcsvc/yp.h
+++ b/nis/rpcsvc/yp.h
@@ -5,23 +5,23 @@
  * 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
@@ -51,13 +51,13 @@ enum ypstat {
 	YP_VERS = -8,
 };
 typedef enum ypstat ypstat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypstat(XDR *, ypstat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypstat(XDR *, ypstat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypstat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum ypxfrstat {
@@ -79,69 +79,69 @@ enum ypxfrstat {
 	YPXFR_REFUSED = -14,
 };
 typedef enum ypxfrstat ypxfrstat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypxfrstat(XDR *, ypxfrstat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypxfrstat(XDR *, ypxfrstat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypxfrstat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *domainname;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_domainname(XDR *, domainname*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_domainname(XDR *, domainname*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_domainname();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *mapname;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_mapname(XDR *, mapname*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_mapname(XDR *, mapname*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_mapname();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef char *peername;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_peername(XDR *, peername*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_peername(XDR *, peername*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_peername();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef struct {
 	u_int keydat_len;
 	char *keydat_val;
 } keydat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_keydat(XDR *, keydat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_keydat(XDR *, keydat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_keydat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 typedef struct {
 	u_int valdat_len;
 	char *valdat_val;
 } valdat;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_valdat(XDR *, valdat*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_valdat(XDR *, valdat*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_valdat();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypmap_parms {
@@ -151,13 +151,13 @@ struct ypmap_parms {
 	peername peer;
 };
 typedef struct ypmap_parms ypmap_parms;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypmap_parms(XDR *, ypmap_parms*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypmap_parms(XDR *, ypmap_parms*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypmap_parms();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypreq_key {
@@ -166,13 +166,13 @@ struct ypreq_key {
 	keydat key;
 };
 typedef struct ypreq_key ypreq_key;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypreq_key(XDR *, ypreq_key*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypreq_key(XDR *, ypreq_key*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypreq_key();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypreq_nokey {
@@ -180,13 +180,13 @@ struct ypreq_nokey {
 	mapname map;
 };
 typedef struct ypreq_nokey ypreq_nokey;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypreq_nokey();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypreq_xfr {
@@ -196,13 +196,13 @@ struct ypreq_xfr {
 	u_int port;
 };
 typedef struct ypreq_xfr ypreq_xfr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypreq_xfr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_val {
@@ -210,28 +210,28 @@ struct ypresp_val {
 	valdat val;
 };
 typedef struct ypresp_val ypresp_val;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_val(XDR *, ypresp_val*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_val(XDR *, ypresp_val*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_val();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_key_val {
 	ypstat stat;
-	valdat val;
 	keydat key;
+	valdat val;
 };
 typedef struct ypresp_key_val ypresp_key_val;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_key_val();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_master {
@@ -239,13 +239,13 @@ struct ypresp_master {
 	peername peer;
 };
 typedef struct ypresp_master ypresp_master;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_master(XDR *, ypresp_master*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_master(XDR *, ypresp_master*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_master();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_order {
@@ -253,13 +253,13 @@ struct ypresp_order {
 	u_int ordernum;
 };
 typedef struct ypresp_order ypresp_order;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_order(XDR *, ypresp_order*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_order(XDR *, ypresp_order*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_order();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_all {
@@ -269,13 +269,13 @@ struct ypresp_all {
 	} ypresp_all_u;
 };
 typedef struct ypresp_all ypresp_all;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_all(XDR *, ypresp_all*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_all(XDR *, ypresp_all*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_all();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_xfr {
@@ -283,13 +283,13 @@ struct ypresp_xfr {
 	ypxfrstat xfrstat;
 };
 typedef struct ypresp_xfr ypresp_xfr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_xfr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypmaplist {
@@ -297,13 +297,13 @@ struct ypmaplist {
 	struct ypmaplist *next;
 };
 typedef struct ypmaplist ypmaplist;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypmaplist(XDR *, ypmaplist*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypmaplist(XDR *, ypmaplist*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypmaplist();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypresp_maplist {
@@ -311,13 +311,13 @@ struct ypresp_maplist {
 	ypmaplist *maps;
 };
 typedef struct ypresp_maplist ypresp_maplist;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypresp_maplist();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum yppush_status {
@@ -339,13 +339,13 @@ enum yppush_status {
 	YPPUSH_REFUSED = -14,
 };
 typedef enum yppush_status yppush_status;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_yppush_status(XDR *, yppush_status*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_yppush_status(XDR *, yppush_status*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_yppush_status();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct yppushresp_xfr {
@@ -353,13 +353,13 @@ struct yppushresp_xfr {
 	yppush_status status;
 };
 typedef struct yppushresp_xfr yppushresp_xfr;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_yppushresp_xfr();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 enum ypbind_resptype {
@@ -367,13 +367,13 @@ enum ypbind_resptype {
 	YPBIND_FAIL_VAL = 2,
 };
 typedef enum ypbind_resptype ypbind_resptype;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypbind_resptype();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypbind_binding {
@@ -381,13 +381,13 @@ struct ypbind_binding {
 	char ypbind_binding_port[2];
 };
 typedef struct ypbind_binding ypbind_binding;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypbind_binding(XDR *, ypbind_binding*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypbind_binding(XDR *, ypbind_binding*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypbind_binding();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 struct ypbind_resp {
@@ -398,13 +398,13 @@ struct ypbind_resp {
 	} ypbind_resp_u;
 };
 typedef struct ypbind_resp ypbind_resp;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypbind_resp(XDR *, ypbind_resp*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypbind_resp(XDR *, ypbind_resp*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypbind_resp();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define YPBIND_ERR_ERR 1
 #define YPBIND_ERR_NOSERV 2
@@ -416,13 +416,13 @@ struct ypbind_setdom {
 	u_int ypsetdom_vers;
 };
 typedef struct ypbind_setdom ypbind_setdom;
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" bool_t xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-#elif __STDC__ 
+#elif __STDC__
 extern  bool_t xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-#else /* Old Style C */ 
+#else /* Old Style C */
 bool_t xdr_ypbind_setdom();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 
 #define YPPROG ((u_long)100004)
@@ -504,7 +504,7 @@ extern  ypresp_order * ypproc_order_2_svc(ypreq_nokey *, struct svc_req *);
 extern  ypresp_maplist * ypproc_maplist_2(domainname *, CLIENT *);
 extern  ypresp_maplist * ypproc_maplist_2_svc(domainname *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define YPPROC_NULL ((u_long)0)
 extern  void * ypproc_null_2();
 extern  void * ypproc_null_2_svc();
@@ -541,7 +541,7 @@ extern  ypresp_order * ypproc_order_2_svc();
 #define YPPROC_MAPLIST ((u_long)11)
 extern  ypresp_maplist * ypproc_maplist_2();
 extern  ypresp_maplist * ypproc_maplist_2_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define YPPUSH_XFRRESPPROG ((u_long)0x40000000)
 #define YPPUSH_XFRRESPVERS ((u_long)1)
@@ -562,14 +562,14 @@ extern  void * yppushproc_null_1_svc(void *, struct svc_req *);
 extern  void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
 extern  void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define YPPUSHPROC_NULL ((u_long)0)
 extern  void * yppushproc_null_1();
 extern  void * yppushproc_null_1_svc();
 #define YPPUSHPROC_XFRRESP ((u_long)1)
 extern  void * yppushproc_xfrresp_1();
 extern  void * yppushproc_xfrresp_1_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #define YPBINDPROG ((u_long)100007)
 #define YPBINDVERS ((u_long)2)
@@ -596,7 +596,7 @@ extern  ypbind_resp * ypbindproc_domain_2_svc(domainname *, struct svc_req *);
 extern  void * ypbindproc_setdom_2(ypbind_setdom *, CLIENT *);
 extern  void * ypbindproc_setdom_2_svc(ypbind_setdom *, struct svc_req *);
 
-#else /* Old Style C */ 
+#else /* Old Style C */
 #define YPBINDPROC_NULL ((u_long)0)
 extern  void * ypbindproc_null_2();
 extern  void * ypbindproc_null_2_svc();
@@ -606,6 +606,6 @@ extern  ypbind_resp * ypbindproc_domain_2_svc();
 #define YPBINDPROC_SETDOM ((u_long)2)
 extern  void * ypbindproc_setdom_2();
 extern  void * ypbindproc_setdom_2_svc();
-#endif /* Old Style C */ 
+#endif /* Old Style C */
 
 #endif /* !__RPCSVC_YP_H__ */
diff --git a/nis/rpcsvc/yp.x b/nis/rpcsvc/yp.x
index be855df749..6be27820b3 100644
--- a/nis/rpcsvc/yp.x
+++ b/nis/rpcsvc/yp.x
@@ -7,23 +7,23 @@
  * 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
@@ -82,7 +82,7 @@ typedef opaque valdat<YPMAXRECORD>;
 
 
 struct ypmap_parms {
-	domainname domain;	
+	domainname domain;
 	mapname map;
 	unsigned int ordernum;
 	peername peer;
@@ -95,10 +95,10 @@ struct ypreq_key {
 };
 
 struct ypreq_nokey {
-	domainname domain;	
+	domainname domain;
 	mapname map;
 };
-	
+
 struct ypreq_xfr {
 	ypmap_parms map_parms;
 	unsigned int transid;
@@ -114,18 +114,13 @@ struct ypresp_val {
 
 struct ypresp_key_val {
 	ypstat stat;
-#ifdef STUPID_SUN_BUG
 	keydat key;
 	valdat val;
-#else
-	valdat val;
-	keydat key;
-#endif
 };
 
 
 struct ypresp_master {
-	ypstat stat;	
+	ypstat stat;
 	peername peer;
 };
 
@@ -184,31 +179,31 @@ struct yppushresp_xfr {
  * Response structure and overall result status codes.  Success and failure
  * represent two separate response message types.
  */
- 
+
 enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1, 
+	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.
  */
@@ -224,11 +219,11 @@ struct ypbind_setdom {
  */
 program YPPROG {
 	version YPVERS {
-		void 
+		void
 		YPPROC_NULL(void) = 0;
 
-		bool 
-		YPPROC_DOMAIN(domainname) = 1;	
+		bool
+		YPPROC_DOMAIN(domainname) = 1;
 
 		bool
 		YPPROC_DOMAIN_NONACK(domainname) = 2;
@@ -236,10 +231,10 @@ program YPPROG {
 		ypresp_val
 		YPPROC_MATCH(ypreq_key) = 3;
 
-		ypresp_key_val 
+		ypresp_key_val
 		YPPROC_FIRST(ypreq_key) = 4;
 
-		ypresp_key_val 
+		ypresp_key_val
 		YPPROC_NEXT(ypreq_key) = 5;
 
 		ypresp_xfr
@@ -257,7 +252,7 @@ program YPPROG {
 		ypresp_order
 		YPPROC_ORDER(ypreq_nokey) = 10;
 
-		ypresp_maplist 
+		ypresp_maplist
 		YPPROC_MAPLIST(domainname) = 11;
 	} = 2;
 } = 100004;
@@ -272,7 +267,7 @@ program YPPUSH_XFRRESPPROG {
 		YPPUSHPROC_NULL(void) = 0;
 
 #ifdef STUPID_SUN_BUG
-		yppushresp_xfr	
+		yppushresp_xfr
 		YPPUSHPROC_XFRRESP(void) = 1;
 #else
 		void
@@ -288,7 +283,7 @@ program YPBINDPROG {
 	version YPBINDVERS {
 		void
 		YPBINDPROC_NULL(void) = 0;
-	
+
 		ypbind_resp
 		YPBINDPROC_DOMAIN(domainname) = 1;
 
@@ -296,5 +291,3 @@ program YPBINDPROG {
 		YPBINDPROC_SETDOM(ypbind_setdom) = 2;
 	} = 2;
 } = 100007;
-
-