diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-02-13 20:49:12 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-02-13 20:49:12 +0000 |
| commit | cbc6c3faf207a14c2c47fc8781d1316c2312fdd5 (patch) | |
| tree | a84e292dc83d4c1bde6756caa0646ba52e4db24d | |
| parent | d557ec04622a7c461e77f9a3aff27c2222f7beba (diff) | |
| download | samba-cbc6c3faf207a14c2c47fc8781d1316c2312fdd5.tar.gz samba-cbc6c3faf207a14c2c47fc8781d1316c2312fdd5.tar.bz2 samba-cbc6c3faf207a14c2c47fc8781d1316c2312fdd5.zip | |
Fixed inclusion of crypt.h bug when libdes is being used on Solaris
only.
jra@cygnus.com
(This used to be commit c189ef38455653334b8414f30d0aeaa3ecefa202)
| -rw-r--r-- | source3/Makefile.RPM | 2 | ||||
| -rw-r--r-- | source3/include/includes.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/Makefile.RPM b/source3/Makefile.RPM index 9425d4bfa3..83cc38d056 100644 --- a/source3/Makefile.RPM +++ b/source3/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/source3/include/includes.h b/source3/include/includes.h index 0e93df35fd..a8653d0978 100644 --- a/source3/include/includes.h +++ b/source3/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 *); |