diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 18:38:45 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 18:38:45 +0200 |
| commit | edeb20b92128f1859d2d8ecee820846ac5799ed5 (patch) | |
| tree | b7c66bf4da6bbe5628fc25def555448d1789b5b1 /source3/include | |
| parent | da01822671b3a553fd805315df7322b8225cfe95 (diff) | |
| parent | d2062ab74f7684f8b6975a7415fac23389851278 (diff) | |
| download | samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.gz samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.bz2 samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
Conflicts:
source3/include/includes.h
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 25135d75ed..0417a7e01c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -688,6 +688,7 @@ typedef char fstring[FSTRING_LEN]; #include "rap.h" #include "../lib/crypto/md5.h" #include "../lib/crypto/arcfour.h" +#include "../lib/crypto/crc32.h" #include "../lib/crypto/hmacmd5.h" #include "ntlmssp.h" #include "auth.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index ad7350c5d1..198248c517 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -432,10 +432,6 @@ int connections_forall(int (*fn)(struct db_record *rec, void *private_data); bool connections_init(bool rw); -/* The following definitions come from lib/crc32.c */ - -uint32 crc32_calc_buffer(const char *buf, size_t size); - /* The following definitions come from lib/data_blob.c */ DATA_BLOB data_blob(const void *p, size_t length); |