diff options
| author | Arjun Shankar <arjun@redhat.com> | 2023-10-02 14:55:20 +0200 |
|---|---|---|
| committer | Arjun Shankar <arjun@redhat.com> | 2023-10-24 12:30:59 +0200 |
| commit | 1c40266328babd3613d0fc7928449a7b53d87c73 (patch) | |
| tree | 095c283352dd9ad0ddcefbca32d7fa9c462f4633 | |
| parent | 4298586619e4a8cf4ba0a5a9da31ae80efac173c (diff) | |
| download | glibc-1c40266328babd3613d0fc7928449a7b53d87c73.tar glibc-1c40266328babd3613d0fc7928449a7b53d87c73.tar.gz glibc-1c40266328babd3613d0fc7928449a7b53d87c73.tar.bz2 glibc-1c40266328babd3613d0fc7928449a7b53d87c73.zip | |
Move 'ethers' routines from 'inet' into 'nss'
ether_hostton and ether_ntohost are entry points for nss functionality.
This commit moves them from the 'inet' subdirectory to 'nss', and
adjusts any references accordingly.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | inet/Makefile | 2 | ||||
| -rw-r--r-- | inet/Versions | 4 | ||||
| -rw-r--r-- | nss/Makefile | 6 | ||||
| -rw-r--r-- | nss/Versions | 1 | ||||
| -rw-r--r-- | nss/ether_hton.c (renamed from inet/ether_hton.c) | 2 | ||||
| -rw-r--r-- | nss/ether_ntoh.c (renamed from inet/ether_ntoh.c) | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/inet/Makefile b/inet/Makefile index bd3dc58322..4d053de748 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -43,11 +43,9 @@ routines := \ deadline \ ether_aton \ ether_aton_r \ - ether_hton \ ether_line \ ether_ntoa \ ether_ntoa_r \ - ether_ntoh \ gethstbyad \ gethstbyad_r \ gethstbynm \ diff --git a/inet/Versions b/inet/Versions index e6d1e6f1ba..a7c1a0fb6f 100644 --- a/inet/Versions +++ b/inet/Versions @@ -10,8 +10,8 @@ libc { endaliasent; endhostent; endnetent; endnetgrent; endprotoent; endservent; # e* - ether_aton; ether_aton_r; ether_hostton; ether_line; ether_ntoa; - ether_ntoa_r; ether_ntohost; + ether_aton; ether_aton_r; ether_line; ether_ntoa; + ether_ntoa_r; # g* getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; diff --git a/nss/Makefile b/nss/Makefile index 2dfa7ebef9..148c6dc1cf 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -68,6 +68,12 @@ CFLAGS-getaliasent_r.c += -fexceptions CFLAGS-getaliasent.c += -fexceptions endif +# ethers routines: +routines += \ + ether_hton \ + ether_ntoh \ + # routines + # grp routines: routines += \ fgetgrent \ diff --git a/nss/Versions b/nss/Versions index 5d1b1dac3d..99208cb9df 100644 --- a/nss/Versions +++ b/nss/Versions @@ -10,6 +10,7 @@ libc { endgrent; endpwent; endspent; + ether_hostton; ether_ntohost; # f* fgetgrent; fgetgrent_r; diff --git a/inet/ether_hton.c b/nss/ether_hton.c index 1b49a57f48..5419464756 100644 --- a/inet/ether_hton.c +++ b/nss/ether_hton.c @@ -20,7 +20,7 @@ #include <netinet/if_ether.h> #include <string.h> -#include "../nss/nsswitch.h" +#include "nsswitch.h" /* Type of the lookup function we need here. */ typedef int (*lookup_function) (const char *, struct etherent *, char *, int, diff --git a/inet/ether_ntoh.c b/nss/ether_ntoh.c index 9f9d7c1a63..2f1eb4ec3d 100644 --- a/inet/ether_ntoh.c +++ b/nss/ether_ntoh.c @@ -20,7 +20,7 @@ #include <netinet/if_ether.h> #include <string.h> -#include <nss/nsswitch.h> +#include <nsswitch.h> /* Type of the lookup function we need here. */ |