diff options
| author | Andreas Jaeger <aj@suse.de> | 2000-12-21 14:38:26 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2000-12-21 14:38:26 +0000 |
| commit | 6b083d46e4f8de4d50daa6e12a1692bc744e2b9a (patch) | |
| tree | 4dec8b7b628bef4c829ec83ae3f5e6bc78ee635b /nis/nss_nis | |
| parent | e3bb40e6bff112c40fd7a3afaade03d564b4a95a (diff) | |
| download | glibc-6b083d46e4f8de4d50daa6e12a1692bc744e2b9a.tar glibc-6b083d46e4f8de4d50daa6e12a1692bc744e2b9a.tar.gz glibc-6b083d46e4f8de4d50daa6e12a1692bc744e2b9a.tar.bz2 glibc-6b083d46e4f8de4d50daa6e12a1692bc744e2b9a.zip | |
* 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.
Diffstat (limited to 'nis/nss_nis')
| -rw-r--r-- | nis/nss_nis/nis-ethers.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c index c90091748e..f7ff50578e 100644 --- a/nis/nss_nis/nis-ethers.c +++ b/nis/nss_nis/nis-ethers.c @@ -24,6 +24,7 @@ #include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> +#include <netinet/ether.h> #include <netinet/if_ether.h> #include "nss-nis.h" @@ -31,15 +32,9 @@ /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) -struct ether -{ - const char *e_name; - struct ether_addr e_addr; -}; - /* Get the declaration of the parser function. */ #define ENTNAME etherent -#define STRUCTURE ether +#define STRUCTURE etherent #define EXTERN_PARSER #include <nss/nss_files/files-parse.c> @@ -149,7 +144,7 @@ _nss_nis_endetherent (void) } static enum nss_status -internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen, +internal_nis_getetherent_r (struct etherent *eth, char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; @@ -184,7 +179,7 @@ internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen, } enum nss_status -_nss_nis_getetherent_r (struct ether *result, char *buffer, size_t buflen, +_nss_nis_getetherent_r (struct etherent *result, char *buffer, size_t buflen, int *errnop) { int status; @@ -199,7 +194,7 @@ _nss_nis_getetherent_r (struct ether *result, char *buffer, size_t buflen, } enum nss_status -_nss_nis_gethostton_r (const char *name, struct ether *eth, +_nss_nis_gethostton_r (const char *name, struct etherent *eth, char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; @@ -256,7 +251,7 @@ _nss_nis_gethostton_r (const char *name, struct ether *eth, } enum nss_status -_nss_nis_getntohost_r (struct ether_addr *addr, struct ether *eth, +_nss_nis_getntohost_r (const struct ether_addr *addr, struct etherent *eth, char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; |