diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-21 22:01:32 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-21 22:01:32 +1100 |
| commit | 24efc9fc36194d379838eb9911b65e93535da19b (patch) | |
| tree | fa08fcbf21143655eb85ba79c6169b3b2eb24fdd /source4/scripting | |
| parent | 8623c981b4a67dafc19234faffced1796f33b975 (diff) | |
| parent | 440b1a1d04bca3027100b3bda84738730ffce71c (diff) | |
| download | samba-24efc9fc36194d379838eb9911b65e93535da19b.tar.gz samba-24efc9fc36194d379838eb9911b65e93535da19b.tar.bz2 samba-24efc9fc36194d379838eb9911b65e93535da19b.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit b99b604a5f8b7eb98a6285145188c0b94946df78)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/ejs/config.mk | 12 | ||||
| -rw-r--r-- | source4/scripting/python/modules.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 8b680ba973..656ecdae16 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -1,10 +1,6 @@ -####################### -# Start LIBRARY EJSRPC [SUBSYSTEM::EJSRPC] OBJ_FILES = \ ejsrpc.o -# End SUBSYSTEM EJSRPC -####################### [MODULE::smbcalls_config] OBJ_FILES = smbcalls_config.o @@ -79,11 +75,7 @@ INIT_FUNCTION = smb_setup_ejs_system include ejsnet/config.mk -####################### -# Start LIBRARY smbcalls -[LIBRARY::smbcalls] -SO_VERSION = 0 -VERSION = 0.0.1 +[SUBSYSTEM::smbcalls] PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ smbcalls.o \ @@ -101,8 +93,6 @@ PRIVATE_DEPENDENCIES = \ CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \ dcerpc \ NDR_TABLE -# End SUBSYSTEM smbcalls -####################### ####################### # Start BINARY SMBSCRIPT diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index b2dd50b507..fff981e941 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -46,6 +46,8 @@ static void initdcerpc_security(void) {} extern void initlsa(void); extern void initsvcctl(void); extern void initwkssvc(void); +extern void init_libcli_nbt(void); +extern void init_libcli_smb(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; |