diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 18:46:18 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 18:46:18 -0700 |
| commit | 7744283c36803836f698c12710e8c0ec8fbd8e93 (patch) | |
| tree | 62ef35c75a812c7bca36c59d3b90cd0c3095d06f /source3/Makefile.in | |
| parent | a04caf329fefccad0fc272474025f6d23a4deaa2 (diff) | |
| parent | 10e25fc5e90e9eaabedc2f3477ac1e8947c88c77 (diff) | |
| download | samba-7744283c36803836f698c12710e8c0ec8fbd8e93.tar.gz samba-7744283c36803836f698c12710e8c0ec8fbd8e93.tar.bz2 samba-7744283c36803836f698c12710e8c0ec8fbd8e93.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index a89bbae6ab..65feb8446b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -372,7 +372,8 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \ CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \ ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \ ../lib/crypto/md4.o \ - ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o + ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o \ + ../lib/crypto/aes.o ../lib/crypto/rijndael-alg-fst.o LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \ @@ -495,6 +496,7 @@ CLDAP_OBJ = libads/cldap.o \ TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o SCHANNEL_OBJ = ../libcli/auth/credentials.o \ + ../libcli/auth/schannel_sign.o \ ../libcli/auth/schannel_state_tdb.o \ ../librpc/gen_ndr/ndr_schannel.o \ ../librpc/ndr/ndr_schannel.o \ |