The branch, master has been updated via 033bc4682b7c7541966da4b2b43b65a4ba722b43 (commit) from 6a78e56277799672b7ac187c57e546836e136f79 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 033bc4682b7c7541966da4b2b43b65a4ba722b43 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Sat Oct 11 16:17:14 2008 +0200 Prevent errors with data_blob() being a macro in s4 and function in s3. ----------------------------------------------------------------------- Summary of changes: lib/crypto/arcfour.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/crypto/arcfour.c b/lib/crypto/arcfour.c index c57e05d..b4773f4 100644 --- a/lib/crypto/arcfour.c +++ b/lib/crypto/arcfour.c @@ -81,7 +81,7 @@ _PUBLIC_ void arcfour_crypt_blob(uint8_t *data, int len, const DATA_BLOB *key) */ _PUBLIC_ void arcfour_crypt(uint8_t *data, const uint8_t keystr[16], int len) { - DATA_BLOB key = data_blob(keystr, 16); + DATA_BLOB key = { discard_const_p(uint8_t, keystr), 16 }; arcfour_crypt_blob(data, len, &key); -- Samba Shared Repository