From cd3e933325e68e23516a196a8fea7f49b1e497c3 Mon Sep 17 00:00:00 2001 From: Ali Bahrami Date: Thu, 24 Jun 2010 18:16:42 -0600 Subject: 6916796 OSnet mapfiles should use version 2 link-editor syntax --HG-- rename : usr/src/cmd/sgs/libelf/common/mapfile-common => usr/src/cmd/sgs/libelf/common/mapfile-vers rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings => usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt => usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep => usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss => usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who => usr/src/cmd/sgs/link_audit/common/mapfile-vers-who rename : usr/src/common/mapfiles/i386/map.noexdata => usr/src/common/mapfiles/common/map.noexdata rename : usr/src/lib/libaio/sparc/mapfile-vers => usr/src/lib/libaio/common/mapfile-vers rename : usr/src/lib/libelfsign/common/mapfile.map => usr/src/lib/libelfsign/common/mapfile-vers rename : usr/src/lib/libpthread/sparc/mapfile-vers => usr/src/lib/libpthread/common/mapfile-vers rename : usr/src/lib/librt/amd64/mapfile-vers => usr/src/lib/librt/common/mapfile-vers rename : usr/src/lib/libsys/sparc/mapfile-vers => usr/src/lib/libsys/common/mapfile-vers rename : usr/src/lib/libthread/sparc/mapfile-vers => usr/src/lib/libthread/common/mapfile-vers --- usr/src/cmd/tcpd/mapfile-intf-tcpdchk | 31 ++++++++++++++++--------------- usr/src/cmd/tcpd/mapfile-intf-tcpdmatch | 23 ++++++++++++----------- usr/src/cmd/tcpd/mapfile-intf-tryfrom | 16 +++++++++------- 3 files changed, 37 insertions(+), 33 deletions(-) (limited to 'usr/src/cmd/tcpd') diff --git a/usr/src/cmd/tcpd/mapfile-intf-tcpdchk b/usr/src/cmd/tcpd/mapfile-intf-tcpdchk index 395d2a06af..dbccafc10f 100644 --- a/usr/src/cmd/tcpd/mapfile-intf-tcpdchk +++ b/usr/src/cmd/tcpd/mapfile-intf-tcpdchk @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -38,22 +37,24 @@ # MAPFILE HEADER END # +$mapfile_version 2 + # tcpdchk interposes on numerous routines, and must export other data # structures to satisfy external dependency requirements. -{ +SYMBOL_SCOPE { 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; + clean_exit { FLAGS = INTERPOSE }; + closelog { FLAGS = INTERPOSE }; + hosts_access_verbose { FLAGS = INTERPOSE }; + hosts_allow_table { FLAGS = INTERPOSE }; + hosts_deny_table { FLAGS = INTERPOSE }; + openlog { FLAGS = INTERPOSE }; + resident { FLAGS = INTERPOSE }; + rfc931 { FLAGS = INTERPOSE }; + rfc931_timeout { FLAGS = INTERPOSE }; + shell_cmd { FLAGS = INTERPOSE }; + syslog { FLAGS = INTERPOSE }; + vsyslog { FLAGS = 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 index f784cae9e4..c3397493e3 100644 --- a/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch +++ b/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -38,18 +37,20 @@ # MAPFILE HEADER END # +$mapfile_version 2 + # tcpdmatch interposes on numerous routines, and must export other data # structures to satisfy external dependency requirements. -{ +SYMBOL_SCOPE { global: - clean_exit = INTERPOSE; - closelog = INTERPOSE; - openlog = INTERPOSE; - rfc931 = INTERPOSE; - rfc931_timeout = INTERPOSE; - shell_cmd = INTERPOSE; - syslog = INTERPOSE; - vsyslog = INTERPOSE; + clean_exit { FLAGS = INTERPOSE }; + closelog { FLAGS = INTERPOSE }; + openlog { FLAGS = INTERPOSE }; + rfc931 { FLAGS = INTERPOSE }; + rfc931_timeout { FLAGS = INTERPOSE }; + shell_cmd { FLAGS = INTERPOSE }; + syslog { FLAGS = INTERPOSE }; + vsyslog { FLAGS = 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 index a4f78265fa..2035dffedd 100644 --- a/usr/src/cmd/tcpd/mapfile-intf-tryfrom +++ b/usr/src/cmd/tcpd/mapfile-intf-tryfrom @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # try-from interposes on numerous routines, and must export other data # structures to satisfy external dependency requirements. @@ -39,12 +38,15 @@ # # MAPFILE HEADER END # -{ + +$mapfile_version 2 + +SYMBOL_SCOPE { global: - closelog = INTERPOSE; - openlog = INTERPOSE; - syslog = INTERPOSE; - vsyslog = INTERPOSE; + closelog { FLAGS = INTERPOSE }; + openlog { FLAGS = INTERPOSE }; + syslog { FLAGS = INTERPOSE }; + vsyslog { FLAGS = INTERPOSE }; allow_severity; # required by libwrap deny_severity; # required by libwrap -- cgit v1.2.3