diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-28 11:25:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:18 -0500 |
| commit | 99ecf2d95325e7b6143596760dbc2780ba246dc6 (patch) | |
| tree | bdeb78dd6b25781c1da32426317344a54d456c13 | |
| parent | d534e83c57feac9ebe115c565b5476d0f5160b7b (diff) | |
| download | samba-99ecf2d95325e7b6143596760dbc2780ba246dc6.tar.gz samba-99ecf2d95325e7b6143596760dbc2780ba246dc6.tar.bz2 samba-99ecf2d95325e7b6143596760dbc2780ba246dc6.zip | |
r5053: - fix up the library dependencies so that tools that need nbt don't
need to pull in the whole dcerpc subsystem
- moved smbencrypt.c code into libcli/auth/
(This used to be commit 3351c636af23ad88649e84f4cb88fc1167d5c654)
| -rw-r--r-- | source4/lib/basic.mk | 2 | ||||
| -rw-r--r-- | source4/libcli/auth/config.mk | 3 | ||||
| -rw-r--r-- | source4/libcli/auth/smbencrypt.c (renamed from source4/libcli/util/smbencrypt.c) | 0 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 7 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index ec6071e726..af1420c685 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -69,6 +69,6 @@ ADD_OBJ_FILES = \ lib/db_wrap.o \ lib/gencache.o REQUIRED_SUBSYSTEMS = \ - LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO LIB_SECURITY EXT_LIB_DL LIBTALLOC + LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC # End SUBSYSTEM LIBBASIC ############################## diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk index a3bb3f1c78..c40a1346db 100644 --- a/source4/libcli/auth/config.mk +++ b/source4/libcli/auth/config.mk @@ -3,7 +3,8 @@ [SUBSYSTEM::LIBCLI_AUTH] ADD_OBJ_FILES = libcli/auth/schannel.o \ libcli/auth/credentials.o \ - libcli/auth/session.o + libcli/auth/session.o \ + libcli/auth/smbencrypt.o REQUIRED_SUBSYSTEMS = \ AUTH SCHANNELDB GENSEC # End SUBSYSTEM LIBCLI_AUTH diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/auth/smbencrypt.c index 7e2890272c..7e2890272c 100644 --- a/source4/libcli/util/smbencrypt.c +++ b/source4/libcli/auth/smbencrypt.c diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 806ef775dc..06b46c6f18 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -5,8 +5,7 @@ ADD_OBJ_FILES = libcli/util/asn1.o \ libcli/util/errormap.o \ libcli/util/clierror.o \ libcli/util/nterr.o \ - libcli/util/smbdes.o \ - libcli/util/smbencrypt.o + libcli/util/smbdes.o [SUBSYSTEM::LIBCLI_LSA] ADD_OBJ_FILES = libcli/util/clilsa.o @@ -26,7 +25,7 @@ ADD_OBJ_FILES = \ libcli/nbt/nbtname.o \ libcli/nbt/nbtsocket.o \ libcli/nbt/namequery.o -REQUIRED_SUBSYSTEMS = NDR_NBT +REQUIRED_SUBSYSTEMS = LIBNDR_RAW NDR_NBT SOCKET [SUBSYSTEM::LIBCLI_RESOLVE] ADD_OBJ_FILES = \ @@ -39,4 +38,4 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT [SUBSYSTEM::LIBCLI] REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \ - LIBCLI_COMPOSITE LIBCLI_NBT LIBCLI_RESOLVE + LIBCLI_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE |