about summary refs log tree commit diff
path: root/nss/Makefile
diff options
context:
space:
mode:
authorArjun Shankar <arjun@redhat.com>2023-10-02 14:55:16 +0200
committerArjun Shankar <arjun@redhat.com>2023-10-24 12:30:59 +0200
commit98b107e30848198e7128f80b38b406585f0317d6 (patch)
tree647f9ea8ec2d63136020411d6dcfef63cdfcf7ca /nss/Makefile
parentb121fdc552f392cd86b21f159dd3e3b998de91a3 (diff)
downloadglibc-98b107e30848198e7128f80b38b406585f0317d6.tar.gz
glibc-98b107e30848198e7128f80b38b406585f0317d6.tar.xz
glibc-98b107e30848198e7128f80b38b406585f0317d6.zip
Remove 'gshadow' and merge into 'nss'
The majority of gshadow routines are entry points for nss functionality.
This commit removes the 'gshadow' subdirectory and moves all
functionality and tests to 'nss'.  References to gshadow/ are
accordingly changed.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nss/Makefile')
-rw-r--r--nss/Makefile28
1 files changed, 28 insertions, 0 deletions
diff --git a/nss/Makefile b/nss/Makefile
index baf7d9d0ab..5256b90f8b 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -24,6 +24,7 @@ include ../Makeconfig
 
 headers := \
   grp.h \
+  gshadow.h \
   nss.h \
   # headers
 
@@ -79,6 +80,29 @@ CFLAGS-initgroups.c += -fexceptions
 CFLAGS-putgrent.c += -fexceptions $(libio-mtsafe)
 endif
 
+# gshadow routines:
+routines += \
+  fgetsgent \
+  fgetsgent_r \
+  getsgent \
+  getsgent_r \
+  getsgnam \
+  getsgnam_r \
+  putsgent \
+  sgetsgent \
+  sgetsgent_r \
+  # routines
+
+ifeq ($(have-thread-library),yes)
+CFLAGS-getsgent_r.c += -fexceptions
+CFLAGS-getsgent.c += -fexceptions
+CFLAGS-fgetsgent.c += -fexceptions
+CFLAGS-fgetsgent_r.c += -fexceptions $(libio-mtsafe)
+CFLAGS-putsgent.c += -fexceptions $(libio-mtsafe)
+CFLAGS-getsgnam.c += -fexceptions
+CFLAGS-getsgnam_r.c += -fexceptions
+endif
+
 # These are the databases that go through nss dispatch.
 # Caution: if you add a database here, you must add its real name
 # in databases.def, too.
@@ -118,6 +142,8 @@ tests := \
   test-digits-dots \
   test-netdb \
   testgrp \
+  tst-fgetsgent_r \
+  tst-gshadow \
   tst-nss-getpwent \
   tst-nss-hash \
   tst-nss-test1 \
@@ -126,6 +152,8 @@ tests := \
   tst-nss-test5 \
   tst-nss-test_errno \
   tst-putgrent \
+  tst-putsgent \
+  tst-sgetsgent \
   # tests
 
 xtests = bug-erange