diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:58:24 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:58:24 +0000 |
commit | 83a580f49a3a7f5aff0aab3946faee0892239251 (patch) | |
tree | 850fef0d49a8c76e88a04d589465f25142265f51 /source3/include | |
parent | ad0d6509a761154c113e040a82ad78e72a3ccf30 (diff) | |
download | samba-83a580f49a3a7f5aff0aab3946faee0892239251.tar.gz samba-83a580f49a3a7f5aff0aab3946faee0892239251.tar.bz2 samba-83a580f49a3a7f5aff0aab3946faee0892239251.zip |
Merge from HEAD:
net ads password
Heimdal compile fixes.
Andrew Bartlett
(This used to be commit 3aa4f923e99f453310bb4a8d43ce43757591909d)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/ads.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index f90983e405..07bf6e4b3b 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -213,3 +213,10 @@ typedef void **ADS_MODLIST; #if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) #define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5 #endif + +/* The older versions of heimdal that don't have this + define don't seem to use it anyway. I'm told they + always use a subkey */ +#ifndef AP_OPTS_USE_SUBKEY +#define AP_OPTS_USE_SUBKEY 0 +#endif |