diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-06-08 19:06:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-12 07:45:48 +1000 |
| commit | 9b261c008a395a323e0516f4cd3f3134aa050577 (patch) | |
| tree | 91cf543ba7ccd560313bea52fa8678f0456e8485 /source4/heimdal/kuser/kuser_locl.h | |
| parent | 5cef57ff7d899773a084d23838b7f18a83f6e79d (diff) | |
| download | samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.gz samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.bz2 samba-9b261c008a395a323e0516f4cd3f3134aa050577.zip | |
s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e892ff34b6865ba)
Also including the supporting changes required to pass make test
A number of heimdal functions and constants have changed since we last
imported a tree (for the better, but inconvenient for us).
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/kuser/kuser_locl.h')
| -rw-r--r-- | source4/heimdal/kuser/kuser_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal/kuser/kuser_locl.h b/source4/heimdal/kuser/kuser_locl.h index eed9e00af6..eafffe9bff 100644 --- a/source4/heimdal/kuser/kuser_locl.h +++ b/source4/heimdal/kuser/kuser_locl.h @@ -36,9 +36,7 @@ #ifndef __KUSER_LOCL_H__ #define __KUSER_LOCL_H__ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <stdio.h> #include <stdlib.h> @@ -81,7 +79,9 @@ #ifdef HAVE_SYS_IOCCOM_H #include <sys/ioccom.h> #endif +#ifndef NO_AFS #include <kafs.h> +#endif #include "crypto-headers.h" /* for UI_UTIL_read_pw_string */ #ifdef HAVE_LOCALE_H |