summaryrefslogtreecommitdiff
path: root/usr/src/cmd/tcpd
diff options
context:
space:
mode:
authorRichard Lowe <richlowe@richlowe.net>2018-02-11 18:58:28 +0000
committerRichard Lowe <richlowe@richlowe.net>2020-10-13 13:51:13 -0400
commit85f4cb87104c72587029a6e0f1663332c85ba118 (patch)
tree5ebef4ca549bc6422ac6b0627c440e7a7fbab167 /usr/src/cmd/tcpd
parent0a36db39c3cd88f4799ecd9db875f43d834d0a81 (diff)
downloadillumos-joyent-85f4cb87104c72587029a6e0f1663332c85ba118.tar.gz
13184 Stop translating ld(1) options through cw(1)
Reviewed by: Jason King <jason.brian.king+illumos@gmail.com> Reviewed by: Igor Kozhukhov <igor@dilos.org> Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src/cmd/tcpd')
-rw-r--r--usr/src/cmd/tcpd/Makefile18
1 files changed, 8 insertions, 10 deletions
diff --git a/usr/src/cmd/tcpd/Makefile b/usr/src/cmd/tcpd/Makefile
index 1ff5574989..75353e5bdd 100644
--- a/usr/src/cmd/tcpd/Makefile
+++ b/usr/src/cmd/tcpd/Makefile
@@ -39,9 +39,9 @@ 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%)
+tcpdchk := LDFLAGS +=$(MAPFILE.INT.D:%=-Wl,-M%)
+tcpdmatch := LDFLAGS +=$(MAPFILE.INT.M:%=-Wl,-M%)
+try-from := LDFLAGS +=$(MAPFILE.INT.F:%=-Wl,-M%)
.KEEP_STATE:
@@ -52,8 +52,6 @@ install: all $(ROOTUSRSBINPROG)
clean:
$(RM) *.o
-lint: lint_PROG
-
TCPDMATCH_OBJ= tcpdmatch.o fakelog.o inetcf.o scaffold.o
tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) $(MAPFILE.INTF.M)
@@ -95,7 +93,7 @@ NETGROUP = -DNETGROUP
# module, which also gives hints on how to add your own extensions.
# Uncomment the next definition to turn on the language extensions
# (examples: allow, deny, banners, twist and spawn).
-#
+#
STYLE = -DPROCESS_OPTIONS # Enable language extensions.
################################################################
@@ -105,11 +103,11 @@ STYLE = -DPROCESS_OPTIONS # Enable language extensions.
# sendmail transaction logs. See your /etc/syslog.conf file for actual
# path names of logfiles. The tutorial section in the README file
# gives a brief introduction to the syslog daemon.
-#
+#
# Change the FACILITY definition below if you disagree with the default
# disposition. Some syslog versions (including Ultrix 4.x) do not provide
# this flexibility.
-#
+#
# If nothing shows up on your system, it may be that the syslog records
# are sent to a dedicated loghost. It may also be that no syslog daemon
# is running at all. The README file gives pointers to surrogate syslog
@@ -133,7 +131,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normally not logged to the console
# It is a good idea to edit your /etc/rc* files so that they begin with
# an explicit umask setting. On our site we use `umask 022' because it
# does not break anything yet gives adequate protection against tampering.
-#
+#
# The following macro specifies the default umask for processes run under
# control of the daemon wrappers. Comment it out only if you are certain
# that inetd and its children are started with a safe umask value.
@@ -191,7 +189,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
# have someone elses host address. This is relevant for network services
# whose authentication depends on host names, such as rsh and rlogin,
# because the network address is used to look up the remote host name.
-#
+#
# The protection is to refuse TCP connections with IP source routing
# options.
#