diff options
| author | rie <none@none> | 2007-05-17 16:27:31 -0700 |
|---|---|---|
| committer | rie <none@none> | 2007-05-17 16:27:31 -0700 |
| commit | 24da5b34f49324ed742a340010ed5bd3d4e06625 (patch) | |
| tree | d634cc86da07688eb2048c7bfeed71bedea99c80 /usr/src/cmd/tcpd | |
| parent | 3230aa086e19b239f0306ae02bd82e788031cfef (diff) | |
| download | illumos-joyent-24da5b34f49324ed742a340010ed5bd3d4e06625.tar.gz | |
6455532 OSNet cleanup required in preparation for direct bindings
--HG--
rename : usr/src/cmd/bnu/strecpy.c => deleted_files/usr/src/cmd/bnu/strecpy.c
rename : usr/src/cmd/fs.d/ufs/mount/realpath.c => deleted_files/usr/src/cmd/fs.d/ufs/mount/realpath.c
rename : usr/src/cmd/lp/lib/lp/tinames.c => deleted_files/usr/src/cmd/lp/lib/lp/tinames.c
rename : usr/src/cmd/sgs/crle/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/crle/common/mapfile-vers
rename : usr/src/cmd/sgs/elfdump/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/elfdump/common/mapfile-vers
rename : usr/src/cmd/sgs/ldd/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/ldd/common/mapfile-vers
rename : usr/src/cmd/sgs/moe/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/moe/common/mapfile-vers
rename : usr/src/cmd/sgs/pvs/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/pvs/common/mapfile-vers
rename : usr/src/lib/libsocket/amd64/byteorder.s => deleted_files/usr/src/lib/libsocket/amd64/byteorder.s
rename : usr/src/lib/libsocket/i386/byteorder.s => deleted_files/usr/src/lib/libsocket/i386/byteorder.s
rename : usr/src/cmd/sgs/ld/common/mapfile-vers => usr/src/cmd/sgs/ld/common/mapfile-intf
rename : usr/src/cmd/sgs/mapfiles/Makefile => usr/src/common/mapfiles/Makefile
rename : usr/src/cmd/sgs/mapfiles/amd64/Makefile => usr/src/common/mapfiles/amd64/Makefile
rename : usr/src/cmd/sgs/mapfiles/amd64/map.above4G => usr/src/common/mapfiles/amd64/map.above4G
rename : usr/src/cmd/sgs/mapfiles/amd64/map.below4G => usr/src/common/mapfiles/amd64/map.below4G
rename : usr/src/cmd/sgs/mapfiles/common/Makefile => usr/src/common/mapfiles/common/Makefile
rename : usr/src/cmd/mapfile_bssalign => usr/src/common/mapfiles/common/map.bssalign
rename : usr/src/cmd/mapfile_execdata => usr/src/common/mapfiles/common/map.execdata
rename : usr/src/lib/common/mapfile-filter => usr/src/common/mapfiles/common/map.filter
rename : usr/src/cmd/mapfile_noexstk => usr/src/common/mapfiles/common/map.noexstk
rename : usr/src/cmd/sgs/mapfiles/i386/Makefile => usr/src/common/mapfiles/i386/Makefile
rename : usr/src/cmd/sgs/mapfiles/i386/map.default => usr/src/common/mapfiles/i386/map.default
rename : usr/src/cmd/mapfile_noexdata => usr/src/common/mapfiles/i386/map.noexdata
rename : usr/src/cmd/sgs/mapfiles/i386/map.pagealign => usr/src/common/mapfiles/i386/map.pagealign
rename : usr/src/cmd/sgs/mapfiles/sparc/Makefile => usr/src/common/mapfiles/sparc/Makefile
rename : usr/src/cmd/sgs/mapfiles/sparc/map.default => usr/src/common/mapfiles/sparc/map.default
rename : usr/src/cmd/sgs/mapfiles/sparc/map.pagealign => usr/src/common/mapfiles/sparc/map.pagealign
rename : usr/src/cmd/sgs/mapfiles/sparcv9/Makefile => usr/src/common/mapfiles/sparcv9/Makefile
rename : usr/src/cmd/sgs/mapfiles/sparcv9/map.above4G => usr/src/common/mapfiles/sparcv9/map.above4G
rename : usr/src/cmd/sgs/mapfiles/sparcv9/map.below4G => usr/src/common/mapfiles/sparcv9/map.below4G
rename : usr/src/lib/libsocket/inet/byteorder.c => usr/src/lib/libc/sparc/gen/byteorder.c
Diffstat (limited to 'usr/src/cmd/tcpd')
| -rw-r--r-- | usr/src/cmd/tcpd/Makefile | 16 | ||||
| -rw-r--r-- | usr/src/cmd/tcpd/mapfile-intf-tcpdchk | 48 | ||||
| -rw-r--r-- | usr/src/cmd/tcpd/mapfile-intf-tcpdmatch | 44 | ||||
| -rw-r--r-- | usr/src/cmd/tcpd/mapfile-intf-tryfrom | 39 |
4 files changed, 144 insertions, 3 deletions
diff --git a/usr/src/cmd/tcpd/Makefile b/usr/src/cmd/tcpd/Makefile index 890eee46f5..576cf1fab2 100644 --- a/usr/src/cmd/tcpd/Makefile +++ b/usr/src/cmd/tcpd/Makefile @@ -45,6 +45,16 @@ tcpd tcpdmatch try-from := \ tcpdchk := \ LDLIBS += -R$(SFW_ROOT)/lib -L$(ROOTSFWLIB) -lwrap -lnsl +# Various components must export interfaces, but also contain name-space +# clashes with system libraries. +MAPFILE.INT.D = $(MAPFILE.NGB) mapfile-intf-tcpdchk +MAPFILE.INT.M = $(MAPFILE.NGB) mapfile-intf-tcpdmatch +MAPFILE.INT.F = $(MAPFILE.NGB) mapfile-intf-tryfrom + +tcpdchk := LDFLAGS +=$(MAPFILE.INT.D:%=-M%) +tcpdmatch := LDFLAGS +=$(MAPFILE.INT.M:%=-M%) +try-from := LDFLAGS +=$(MAPFILE.INT.F:%=-M%) + # SRCONLY files are not used for building but are included in the source code # package SUNWtcpdS for consistency and completeness with respect to the # public tcp_wrappers distribution. @@ -142,17 +152,17 @@ $(ROOTSFW): TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o -tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) +tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) $(MAPFILE.INTF.M) $(LINK.c) -o $@ $(TCPDMATCH_OBJ) $(LDLIBS) $(POST_PROCESS) -try-from: try-from.o fakelog.o $(LIB) +try-from: try-from.o fakelog.o $(LIB) $(MAPFILE.INTF.F) $(LINK.c) -o $@ try-from.o fakelog.o $(LDLIBS) $(POST_PROCESS) TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o -tcpdchk: $(TCPDCHK_OBJ) $(LIB) +tcpdchk: $(TCPDCHK_OBJ) $(LIB) $(MAPFILE.INTF.C) $(LINK.c) -o $@ $(TCPDCHK_OBJ) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/cmd/tcpd/mapfile-intf-tcpdchk b/usr/src/cmd/tcpd/mapfile-intf-tcpdchk new file mode 100644 index 0000000000..92271c22c8 --- /dev/null +++ b/usr/src/cmd/tcpd/mapfile-intf-tcpdchk @@ -0,0 +1,48 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +# tcpdchk interposes on numerous routines, and must export other data +# structures to satisfy external dependency requirements. +{ + global: + clean_exit = INTERPOSE; + closelog = INTERPOSE; + hosts_access_verbose = INTERPOSE; + hosts_allow_table = INTERPOSE; + hosts_deny_table = INTERPOSE; + openlog = INTERPOSE; + resident = INTERPOSE; + rfc931 = INTERPOSE; + rfc931_timeout = INTERPOSE; + shell_cmd = INTERPOSE; + syslog = INTERPOSE; + vsyslog = INTERPOSE; + + allow_severity; # required by libwrap + deny_severity; # required by libwrap +}; diff --git a/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch b/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch new file mode 100644 index 0000000000..c7593a942b --- /dev/null +++ b/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch @@ -0,0 +1,44 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +# tcpdmatch interposes on numerous routines, and must export other data +# structures to satisfy external dependency requirements. +{ + global: + clean_exit = INTERPOSE; + closelog = INTERPOSE; + openlog = INTERPOSE; + rfc931 = INTERPOSE; + rfc931_timeout = INTERPOSE; + shell_cmd = INTERPOSE; + syslog = INTERPOSE; + vsyslog = INTERPOSE; + + allow_severity; # required by libwrap + deny_severity; # required by libwrap +}; diff --git a/usr/src/cmd/tcpd/mapfile-intf-tryfrom b/usr/src/cmd/tcpd/mapfile-intf-tryfrom new file mode 100644 index 0000000000..31fab42fda --- /dev/null +++ b/usr/src/cmd/tcpd/mapfile-intf-tryfrom @@ -0,0 +1,39 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# +# try-from interposes on numerous routines, and must export other data +# structures to satisfy external dependency requirements. +{ + global: + closelog = INTERPOSE; + openlog = INTERPOSE; + syslog = INTERPOSE; + vsyslog = INTERPOSE; + + allow_severity; # required by libwrap + deny_severity; # required by libwrap +}; |
