summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-02-26 22:58:21 +0000
committerJeremy Allison <jra@samba.org>1998-02-26 22:58:21 +0000
commit45dab9f06594777e96be5f4556e6bb386f68f309 (patch)
treed10f26229efd3f391ebcdf52fe1da7d563fad02f /source3/include
parentb3d9fe61f3085bb47fe8c0c31f51871824db3407 (diff)
downloadsamba-45dab9f06594777e96be5f4556e6bb386f68f309.tar.gz
samba-45dab9f06594777e96be5f4556e6bb386f68f309.tar.bz2
samba-45dab9f06594777e96be5f4556e6bb386f68f309.zip
Makefile, password.c, includes.h: Added KRB4 patches from Johan Hedin <johanh@fusion.kth.se>
nmbd_packets.c: Patch for aliased interfaces from Daniel Haun <dhaun@ecf2.puc.edu>. Jeremy. (This used to be commit 60f6302b1972e49159bf6e1a838e691268e4399c)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index f9c29fd41d..94bf23cef5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -299,9 +299,9 @@ typedef unsigned short mode_t;
#include <rpcsvc/ypclnt.h>
#include <termios.h>
#include <sys/stropts.h>
-#ifndef USE_LIBDES
+#if !defined(USE_LIBDES) && !defined(KRB4_AUTH)
#include <crypt.h>
-#endif /* USE_LIBDES */
+#endif /* !USE_LIBDES && !KRB4_AUTH */
extern int gettimeofday (struct timeval *, void *);
extern int gethostname (char *name, int namelen);
extern int innetgr (const char *, const char *, const char *, const char *);
@@ -1140,6 +1140,10 @@ union semun {
#include <krb5.h>
#endif
+#ifdef KRB4_AUTH
+#include <krb.h>
+#endif
+
#ifdef NO_UTIMBUF
struct utimbuf {
time_t actime;