diff options
| -rw-r--r-- | include/aliases.h | 2 | ||||
| -rw-r--r-- | inet/Makefile | 7 | ||||
| -rw-r--r-- | inet/Versions | 1 | ||||
| -rw-r--r-- | nss/Makefile | 14 | ||||
| -rw-r--r-- | nss/Versions | 1 | ||||
| -rw-r--r-- | nss/aliases.h (renamed from inet/aliases.h) | 0 | ||||
| -rw-r--r-- | nss/getaliasent.c (renamed from inet/getaliasent.c) | 0 | ||||
| -rw-r--r-- | nss/getaliasent_r.c (renamed from inet/getaliasent_r.c) | 0 | ||||
| -rw-r--r-- | nss/getaliasname.c (renamed from inet/getaliasname.c) | 0 | ||||
| -rw-r--r-- | nss/getaliasname_r.c (renamed from inet/getaliasname_r.c) | 0 |
10 files changed, 16 insertions, 9 deletions
diff --git a/include/aliases.h b/include/aliases.h index db82588630..2c7756efe8 100644 --- a/include/aliases.h +++ b/include/aliases.h @@ -1,5 +1,5 @@ #ifndef _ALIASES_H -#include <inet/aliases.h> +#include <nss/aliases.h> # ifndef _ISOMAC diff --git a/inet/Makefile b/inet/Makefile index 9db7f941c6..bd3dc58322 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -24,7 +24,6 @@ include ../Makeconfig headers := \ $(wildcard arpa/*.h protocols/*.h) \ - aliases.h \ bits/in.h \ ifaddrs.h \ netinet/ether.h \ @@ -49,10 +48,6 @@ routines := \ ether_ntoa \ ether_ntoa_r \ ether_ntoh \ - getaliasent \ - getaliasent_r \ - getaliasname \ - getaliasname_r \ gethstbyad \ gethstbyad_r \ gethstbynm \ @@ -176,8 +171,6 @@ CFLAGS-getnetbyad_r.c += -fexceptions CFLAGS-getnetbyad.c += -fexceptions CFLAGS-getnetent_r.c += -fexceptions CFLAGS-getnetent.c += -fexceptions -CFLAGS-getaliasent_r.c += -fexceptions -CFLAGS-getaliasent.c += -fexceptions CFLAGS-getrpcent_r.c += -fexceptions CFLAGS-getrpcent.c += -fexceptions CFLAGS-getservent_r.c += -fexceptions diff --git a/inet/Versions b/inet/Versions index 84cbe847cd..e6d1e6f1ba 100644 --- a/inet/Versions +++ b/inet/Versions @@ -14,7 +14,6 @@ libc { ether_ntoa_r; ether_ntohost; # g* - getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r; getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname; diff --git a/nss/Makefile b/nss/Makefile index 84cf62af2b..2dfa7ebef9 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -23,6 +23,7 @@ subdir := nss include ../Makeconfig headers := \ + aliases.h \ grp.h \ gshadow.h \ nss.h \ @@ -54,6 +55,19 @@ routines = \ valid_list_field \ # routines +# alias routines: +routines += \ + getaliasent \ + getaliasent_r \ + getaliasname \ + getaliasname_r \ + # routines + +ifeq ($(have-thread-library),yes) +CFLAGS-getaliasent_r.c += -fexceptions +CFLAGS-getaliasent.c += -fexceptions +endif + # grp routines: routines += \ fgetgrent \ diff --git a/nss/Versions b/nss/Versions index 632af25be4..5d1b1dac3d 100644 --- a/nss/Versions +++ b/nss/Versions @@ -17,6 +17,7 @@ libc { fgetspent; fgetspent_r; # g* + getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r; getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r; getgroups; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; diff --git a/inet/aliases.h b/nss/aliases.h index bdd704ac6f..bdd704ac6f 100644 --- a/inet/aliases.h +++ b/nss/aliases.h diff --git a/inet/getaliasent.c b/nss/getaliasent.c index 16ec063d1e..16ec063d1e 100644 --- a/inet/getaliasent.c +++ b/nss/getaliasent.c diff --git a/inet/getaliasent_r.c b/nss/getaliasent_r.c index 8ce9d3a58c..8ce9d3a58c 100644 --- a/inet/getaliasent_r.c +++ b/nss/getaliasent_r.c diff --git a/inet/getaliasname.c b/nss/getaliasname.c index 3687467fe2..3687467fe2 100644 --- a/inet/getaliasname.c +++ b/nss/getaliasname.c diff --git a/inet/getaliasname_r.c b/nss/getaliasname_r.c index 85f3d89006..85f3d89006 100644 --- a/inet/getaliasname_r.c +++ b/nss/getaliasname_r.c |