Allow OpenBSD to support encrypted passwords in Userlists.
OpenBSD's crypt(3) function is provided directly by libc and does not
require -lcrypt.
Signed-off-by: Matthieu Guegan <[email protected]>
---
Makefile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index ed0cdd51d..d9c56a663 100644
--- a/Makefile
+++ b/Makefile
@@ -390,8 +390,8 @@ endif
# OpenBSD 6.3 and above
ifeq ($(TARGET),openbsd)
set_target_defaults = $(call default_opts, \
- USE_POLL USE_TPROXY USE_THREAD USE_KQUEUE USE_ACCEPT4 USE_CLOSEFROM \
- USE_GETADDRINFO)
+ USE_POLL USE_TPROXY USE_LIBCRYPT USE_THREAD USE_KQUEUE USE_ACCEPT4 \
+ USE_CLOSEFROM USE_GETADDRINFO)
endif
# NetBSD 8 and above
@@ -429,7 +429,7 @@ endif
ifeq ($(TARGET),cygwin)
set_target_defaults = $(call default_opts, \
USE_POLL USE_TPROXY USE_OBSOLETE_LINKER)
- # Cygwin adds IPv6 support only in version 1.7 (in beta right now).
+ # Cygwin adds IPv6 support only in version 1.7 (in beta right now).
TARGET_CFLAGS = $(if $(filter 1.5.%, $(shell uname -r)),
-DUSE_IPV6 -DAF_INET6=23 -DINET6_ADDRSTRLEN=46, )
endif
@@ -493,10 +493,12 @@ BUILD_FEATURES := $(foreach opt,$(patsubst
USE_%,%,$(use_opts)),$(if $(USE_$(opt
OPTIONS_CFLAGS += $(foreach opt,$(use_opts),$(if $($(opt)),-D$(opt),))
ifneq ($(USE_LIBCRYPT),)
+ifneq ($(TARGET),openbsd)
ifneq ($(TARGET),osx)
OPTIONS_LDFLAGS += -lcrypt
endif
endif
+endif
ifneq ($(USE_SLZ),)
# Use SLZ_INC and SLZ_LIB to force path to zlib.h and libz.{a,so} if needed.
--
2.29.2
--
Disclaimer: This e-mail message including attachments, if any, is
intended only for the person(s) or entity to which it is addressed and may
contain confidential and/or privileged material. Any use of the information
contained herein (including, but not limited to, total or partial
reproduction, communication, or dissemination in any form) by persons other
than the intended recipient(s) is prohibited. If you have received this
e-mail in error, please notify the sender immediately and delete it.
