diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-06-08 15:48:40 +1000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-06-19 21:32:36 +0200 |
| commit | fc13489c91e790ff8952aff1e7db1e6189894e30 (patch) | |
| tree | b36ce2a6e54a0141fecdc2b0561050259bb19c2c /source3 | |
| parent | 5c4772ec1d562a4547391e1dd4956c43e3d635a7 (diff) | |
| download | samba-fc13489c91e790ff8952aff1e7db1e6189894e30.tar.gz samba-fc13489c91e790ff8952aff1e7db1e6189894e30.tar.bz2 samba-fc13489c91e790ff8952aff1e7db1e6189894e30.zip | |
build: Build with system md5.h on OpenIndiana
This changes (again...) our system md5 detection to cope with how
OpenIndiana does md5. I'm becoming increasingly convinced this isn't
worth our while (we should have just done samba_md5...), but for now
this change seems to work on FreeBSD, OpenIndiana and Linux with
libbsd.
This needs us to rename struct MD5Context -> MD5_CTX, but we provide a
config.h define to rename the type bad if MD5_CTX does not exist (it does
however exist in the md5.h from libbsd).
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Jun 19 21:32:36 CEST 2013 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/ntlmssp.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_streams_xattr.c | 2 | ||||
| -rw-r--r-- | source3/rpc_client/init_samr.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c index 3fe1515483..e8c9ebfe72 100644 --- a/source3/libsmb/ntlmssp.c +++ b/source3/libsmb/ntlmssp.c @@ -537,7 +537,7 @@ noccache: return NT_STATUS_NO_MEMORY; } } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) { - struct MD5Context md5_session_nonce_ctx; + MD5_CTX md5_session_nonce_ctx; uint8_t session_nonce[16]; uint8_t session_nonce_hash[16]; uint8_t user_session_key[16]; diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index 11a3cc63e8..355c47c07f 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -39,7 +39,7 @@ struct stream_io { static SMB_INO_T stream_inode(const SMB_STRUCT_STAT *sbuf, const char *sname) { - struct MD5Context ctx; + MD5_CTX ctx; unsigned char hash[16]; SMB_INO_T result; char *upper_sname; diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c index e3bb3015c2..7f1a22908b 100644 --- a/source3/rpc_client/init_samr.c +++ b/source3/rpc_client/init_samr.c @@ -34,7 +34,7 @@ void init_samr_CryptPasswordEx(const char *pwd, /* samr_CryptPasswordEx */ uchar pwbuf[532]; - struct MD5Context md5_ctx; + MD5_CTX md5_ctx; uint8_t confounder[16]; DATA_BLOB confounded_session_key = data_blob(NULL, 16); |