Fixed inclusion of crypt.h bug when libdes is being used on Solaris

only.
jra@cygnus.com

diff --git a/source/Makefile.RPM b/source/Makefile.RPM
index 9425d4bfa39341c09f886dc538004d93a2495024..83cc38d056dce6bf6d2da14d322bf85701e0c917 100644 (file)
--- 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 0e93df35fd2eb9ec0d6b7347c4feedcdc2fc9efc..a8653d09788ccf97b03b37e1c8bd1f02bfd5f697 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -290,8 +290,10 @@ typedef unsigned short mode_t;
 #include <string.h>
 #include <arpa/inet.h>
 #include <rpcsvc/ypclnt.h>
-#include <crypt.h> 
 #include <termios.h>
+#ifndef USE_LIBDES
+#include <crypt.h>
+#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 *);