From 6b083d46e4f8de4d50daa6e12a1692bc744e2b9a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 21 Dec 2000 14:38:26 +0000 Subject: * nis/nss_nisplus/nisplus-ethers.c (struct etherent): Removed. * inet/ether_hton.c: Likewise * inet/ether_ntoh.c: Likewise. * nis/nss_nis/nis-ethers.c (_nss_nis_getntohost_r): Fix declaration to match prototype. * include/netinet/ether.h (struct etherent): Declare here so that all implementations use the same struct. * nis/nss_nis/nis-ethers.c: Include netinet/ether.h to get prototypes. (struct ether): Removed. Use struct etherent instead of ether everywhere. * include/rpc/auth.h (DECLARE_NSS_PROTOTYPES): New. * include/rpc/auth_des.h (DECLARE_NSS_PROTOTYPES): New. * sunrpc/publickey.c: Include auth_des.h for prototypes. --- nis/nss_nisplus/nisplus-ethers.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'nis/nss_nisplus') diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c index ddf6f7f128..a8af4569b8 100644 --- a/nis/nss_nisplus/nisplus-ethers.c +++ b/nis/nss_nisplus/nisplus-ethers.c @@ -35,15 +35,6 @@ static nis_result *result = NULL; static nis_name tablename_val = NULL; static u_long tablename_len = 0; -/* Because the `ethers' lookup does not fit so well in the scheme so - we define a dummy struct here which helps us to use the available - functions. */ -struct etherent -{ - const char *e_name; - struct ether_addr e_addr; -}; -struct etherent_data {}; #define NISENTRYVAL(idx,col,res) \ ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) @@ -53,7 +44,7 @@ struct etherent_data {}; static int _nss_nisplus_parse_etherent (nis_result *result, struct etherent *ether, - char *buffer, size_t buflen, int *errnop) + char *buffer, size_t buflen, int *errnop) { char *p = buffer; size_t room_left = buflen; -- cgit 1.4.1