PERFORCE change 108732 for review

[Michael Bushkov]

http://perforce.freebsd.org/chv.cgi?CH=108732

Change 108732 by bushman at bushman_nss_ldap_cached on 2006/10/30 11:34:27

	+ CFLAGS+=DINET6 is now embraced in proper .if defined clause
	+ libc/gen/Symbol.map edited: __pw_scan, __pw_match_entry and __pw_parse_entry are removed, mention of __gr_parse_entry and __gr_match_entry is removed. All these functions now resied in libnssutil and should not be exported from libc in any way. In libc.a, however they will implicitly appear because of linking-in with nsswitch modules
	+ libutil now links with libnssutil.a to use __pw_scan function
	+ Makefiles formatting improved a bit, libc/Makefile notes updated (reached the 80 column barrier there - new lines and 1 tab were used)

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#10 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Symbol.map#2 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/Makefile#7 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/Makefile#2 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/Makefile#5 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/Makefile#9 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/Makefile#8 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_icmp/Makefile#7 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/Makefile#9 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#10 (text+ko) ====

@@ -14,9 +14,10 @@
 # libmd must be built before libatm, libopie, libradius, and libtacplus.
 # libncurses must be built before libdialog, libedit and libreadline.
 # libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
-# libnssutil must be built before nss_files/nss_dns/nss_nis/nss_compat
-# libnss_files must be built before libnss_compat
-# nssfiles/nss_dns/nss_nis/nss_compat/nss_icmp must be built before libc
+# libnssutil must be built before nss_files, nss_dns, nss_nis, nss_compat 
+# 	and libutil
+# nss_files, nss_dns, nss_nis, nss_compat and nss_icmp	must be built
+#	before libc
 # libopie must be built before libpam.
 # libradius must be built before libpam.
 # librpcsvc must be built before libpam.
@@ -28,10 +29,11 @@
 # Otherwise, the SUBDIR list should be in alphabetical order.
 
 SUBDIR=	${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \
-	libnssutil nss_compat nss_dns nss_files nss_icmp ${_nss_nis}\
-	libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
+	libnetgraph libnssutil \
+	libradius librpcsvc libsbuf libtacplus libutil \
 	${_libypclnt} libalias libarchive ${_libatm} \
-	libbegemot ${_libbluetooth} libbsnmp libbz2 libc \
+	libbegemot ${_libbluetooth} libbsnmp libbz2 \
+	nss_compat nss_dns nss_files nss_icmp ${_nss_nis} libc \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
 	libgssapi libipsec \

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Symbol.map#2 (text) ====

@@ -165,8 +165,6 @@
 	getgrnam;
 	getgrgid;
 	getgrent;
-	#  Why are __gr_parse_entry() and __gr_match_entry() not static in
-	#  gen/getgrent.c?
 	getgrouplist;
 	gethostname;
 	getloadavg;
@@ -402,8 +400,6 @@
 	_err;
 	_warn;
 	__fmtcheck;
-	# __pw_match_entry;
-	# __pw_parse_entry;
 	__fdnlist;	# used by libkvm
 	# __aout_fdnlist;
 	# __elf_is_okay__;
@@ -412,7 +408,6 @@
 	__pause;
 	_pause;
 	__pselect;
-	__pw_scan;	# Used by (at least) libutil
 	__raise;
 	_raise;
 	__sem_init;

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/Makefile#7 (text+ko) ====

@@ -3,7 +3,7 @@
 LIB=	nssutil
 SRCS=	copynetent.c copyhtent.c gr_scan.c pw_scan.c rpcunpack.c\
 	servunpack.c
-INTERNAL=
-NO_PIC=
+INTERNALLIB=
 
 .include <bsd.lib.mk>
+

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/Makefile#2 (text+ko) ====

@@ -21,7 +21,10 @@
 CFLAGS+= -DINET6
 .endif
 
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+# Needed to use __pw_scan function, which is in libnssutil
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libutil
+LD_ADD+= -lnssutil
+LDFLAGS+= -L${.OBJDIR}/../libnssutil
 
 MAN+=	kld.3 login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \
 	login_cap.3 login_class.3 login_times.3 login_ok.3 \

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/Makefile#5 (text+ko) ====

@@ -8,15 +8,19 @@
 SHLIBDIR?=	/lib
 
 SRCS+=	nss_compat.c compat_group.c compat_passwd.c compat_serv.c
-# NOTE: dirty hack with nss_files's file_serv.c is used
+# NOTE: hack with nss_files's file_serv.c is used
 SRCS+=	${.CURDIR}/../nss_files/files_serv.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
 	-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
+.endif
 
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
+
 .if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/Makefile#9 (text+ko) ====

@@ -11,11 +11,15 @@
 	dns_group.c dns_net.c dns_shells.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
 	-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
+.endif
 
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
+
 .if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/Makefile#8 (text+ko) ====

@@ -12,11 +12,15 @@
 	files_net.c files_rpc.c files_shells.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
 	-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
+.endif
 
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
+
 .if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_icmp/Makefile#7 (text+ko) ====

@@ -10,11 +10,15 @@
 SRCS=	nss_icmp.c icmp_hosts_namadr.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
 	-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
+.endif
 
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
+
 .if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/Makefile#9 (text+ko) ====

@@ -11,11 +11,15 @@
 	nis_group.c nis_net.c nis_rpc.c nis_serv.c nis_shells.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
 	-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
+.endif
 
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
+
 .if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif