From c189ef38455653334b8414f30d0aeaa3ecefa202 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 13 Feb 1997 20:49:12 +0000 Subject: [PATCH] Fixed inclusion of crypt.h bug when libdes is being used on Solaris only. jra@cygnus.com --- source/Makefile.RPM | 2 +- source/include/includes.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/Makefile.RPM b/source/Makefile.RPM index 9425d4bfa39..83cc38d056d 100644 --- a/source/Makefile.RPM +++ b/source/Makefile.RPM @@ -98,7 +98,7 @@ PAM_LIBS = -ldl -lpam # DES_BASE=/usr/local/libdes # DES_FLAGS= -I$(DES_BASE) # DES_LIB= -L$(DES_BASE) -ldes -# PASSWD_FLAGS=-DSMB_PASSWD=\"$(BINDIR)/smbpasswd\" -DSMB_PASSWD_FILE=\"$(BASEDIR)/private/smbpasswd\" +# PASSWD_FLAGS=-DUSE_LIBDES -DSMB_PASSWD=\"$(BINDIR)/smbpasswd\" -DSMB_PASSWD_FILE=\"$(BASEDIR)/private/smbpasswd\" ###################################### # VTP-Support diff --git a/source/include/includes.h b/source/include/includes.h index 0e93df35fd2..a8653d09788 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -290,8 +290,10 @@ typedef unsigned short mode_t; #include #include #include -#include #include +#ifndef USE_LIBDES +#include +#endif /* USE_LIBDES */ extern int gettimeofday (struct timeval *, void *); extern int gethostname (char *name, int namelen); extern int innetgr (const char *, const char *, const char *, const char *); -- 2.11.4.GIT