diff options
author | Marco d'Itri <md@linux.it> | 2018-09-16 04:34:58 +0200 |
---|---|---|
committer | Marco d'Itri <md@linux.it> | 2018-09-20 00:18:06 +0200 |
commit | ae31f61a34ed52740fd45f6c3f7821e51caab521 (patch) | |
tree | 5ed6f834c3bd89fb1d6de437134efb36c9a736e2 | |
parent | c12ad950fa1087acabc4056829cce73d9b29c4d8 (diff) | |
download | whois-ae31f61a34ed52740fd45f6c3f7821e51caab521.tar.gz |
mkpasswd: include crypt.h on Solaris
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | config.h | 1 | ||||
-rw-r--r-- | mkpasswd.c | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -52,14 +52,14 @@ DEFS += -DHAVE_ICONV endif ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),) -DEFS += -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt) +DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt) mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt) else ifdef HAVE_XCRYPT DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT mkpasswd_LDADD += -lxcrypt else ifdef HAVE_LIBOWCRYPT # owl and openSUSE have crypt_gensalt(3) in libowcrypt -DEFS += -DHAVE_LINUX_CRYPT_GENSALT -D_OW_SOURCE +DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT -D_OW_SOURCE mkpasswd_LDADD += -lcrypt -lowcrypt else mkpasswd_LDADD += -lcrypt @@ -55,6 +55,7 @@ /* Unknown versions of Solaris */ #if defined __SVR4 && defined __sun # define HAVE_SHA_CRYPT +# define HAVE_CRYPT_H # define HAVE_SOLARIS_CRYPT_GENSALT # define CRYPT_GENSALT_IMPLEMENTS_DEFAULT_PREFIX #endif @@ -39,7 +39,7 @@ #include <xcrypt.h> #include <sys/stat.h> #endif -#ifdef HAVE_LINUX_CRYPT_GENSALT +#ifdef HAVE_CRYPT_H #include <crypt.h> #endif #ifdef HAVE_GETTIMEOFDAY |