about summary refs log tree commit diff
path: root/nss
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-02-06 10:43:19 -0800
committerRoland McGrath <roland@hack.frob.com>2015-02-06 10:43:19 -0800
commita1309c2bd0e7469158dfa5dec3334054fad2ed03 (patch)
tree19d19995e9ec59f3ecf94023aef485f7fc995c32 /nss
parentac9e0e5e401fa634667a8284a0db0ca886bf816b (diff)
downloadglibc-a1309c2bd0e7469158dfa5dec3334054fad2ed03.tar.gz
glibc-a1309c2bd0e7469158dfa5dec3334054fad2ed03.tar.xz
glibc-a1309c2bd0e7469158dfa5dec3334054fad2ed03.zip
Exclude rpcent functions and NSS backends for rpc, key when excluding sunrpc.
Diffstat (limited to 'nss')
-rw-r--r--nss/Makefile12
-rw-r--r--nss/getent.c4
2 files changed, 14 insertions, 2 deletions
diff --git a/nss/Makefile b/nss/Makefile
index d419baf4fd..d75dad2ee6 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -31,8 +31,16 @@ routines		= nsswitch getnssent getnssent_r digits_dots \
 # 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.
-databases		= proto service hosts network grp pwd rpc ethers \
-			  spwd netgrp key alias sgrp
+databases		= proto service hosts network grp pwd ethers \
+			  spwd netgrp alias sgrp
+
+ifneq (,$(filter sunrpc,$(subdirs)))
+databases		+= key rpc
+have-sunrpc		:= 1
+else
+have-sunrpc		:= 0
+endif
+CPPFLAGS-getent.c	= -DHAVE_SUNRPC=$(have-sunrpc)
 
 others                  := getent makedb
 install-bin             := getent makedb
diff --git a/nss/getent.c b/nss/getent.c
index 901ec5e676..34df8487a9 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -700,6 +700,7 @@ protocols_keys (int number, char *key[])
   return result;
 }
 
+#if HAVE_SUNRPC
 /* Now is all for rpc */
 static void
 print_rpc (struct rpcent *rpc)
@@ -745,6 +746,7 @@ rpc_keys (int number, char *key[])
 
   return result;
 }
+#endif
 
 /* for services */
 static void
@@ -884,7 +886,9 @@ D(netgroup)
 D(networks)
 D(passwd)
 D(protocols)
+#if HAVE_SUNRPC
 D(rpc)
+#endif
 D(services)
 D(shadow)
 #undef D