The branch, master has been updated via 11a97d6 build: moved util_reg.c into a common subsystem via 7494796 build: moved spnego_parse.c into a common subsystem from 9e93dac Remember to free the second temporary string.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 11a97d60d931c4a7c431647353e2c423a729c6ea Author: Andrew Tridgell <tri...@samba.org> Date: Thu Feb 24 13:01:27 2011 +1100 build: moved util_reg.c into a common subsystem Autobuild-User: Andrew Tridgell <tri...@samba.org> Autobuild-Date: Thu Feb 24 05:53:52 CET 2011 on sn-devel-104 commit 74947964d915890adc524ca279ca95d96c4e8e34 Author: Andrew Tridgell <tri...@samba.org> Date: Thu Feb 24 13:00:52 2011 +1100 build: moved spnego_parse.c into a common subsystem ----------------------------------------------------------------------- Summary of changes: libcli/auth/wscript_build | 6 +++++- libcli/registry/wscript_build | 4 ++++ source3/wscript_build | 10 +++------- source4/auth/gensec/wscript_build | 4 ++-- source4/lib/registry/wscript_build | 4 ++-- wscript_build | 1 + 6 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 libcli/registry/wscript_build Changeset truncated at 500 lines: diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index 3d9e8e6..0f0e22b 100644 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_LIBRARY('cliauth', source='', - deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS', + deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE', private_library=True, grouping_library=True) @@ -34,3 +34,7 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS', source='pam_errors.c', deps='talloc' ) + +bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE', + source='spnego_parse.c', + deps='ASN1_UTIL') diff --git a/libcli/registry/wscript_build b/libcli/registry/wscript_build new file mode 100644 index 0000000..b9c73aa --- /dev/null +++ b/libcli/registry/wscript_build @@ -0,0 +1,4 @@ + +bld.SAMBA_SUBSYSTEM('util_reg', + source='util_reg.c', + deps='ndr') diff --git a/source3/wscript_build b/source3/wscript_build index 0008bd0..a5c5337 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -64,7 +64,7 @@ LIB_SRC = ''' lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c lib/username.c lib/access.c lib/smbrun.c - lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC} + lib/bitmap.c lib/dprintf.c lib/wins_srv.c lib/clobber.c lib/util_sid.c lib/util_file.c @@ -154,7 +154,6 @@ LIBMSRPC_SRC = ''' # # registry-related objects # -UTIL_REG_SRC = '''../libcli/registry/util_reg.c''' REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c''' REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c''' @@ -757,7 +756,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB SAMBA_VERSION krb5 flag_mapping', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB SAMBA_VERSION krb5 flag_mapping util_reg', private_library=True, vars=locals()) @@ -928,10 +927,6 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE', source=SLCACHE_SRC, vars=locals()) -bld.SAMBA3_SUBSYSTEM('SPNEGO_PARSE', - source='../libcli/auth/spnego_parse.c', - vars=locals()) - bld.SAMBA3_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, vars=locals()) @@ -1340,6 +1335,7 @@ bld.RECURSE('../libcli/security') bld.RECURSE('../libcli/smb') bld.RECURSE('../libcli/smbreadline') bld.RECURSE('../libcli/nbt') +bld.RECURSE('../libcli/registry') bld.RECURSE('../lib/crypto') bld.RECURSE('../lib/iniparser/src') bld.RECURSE('../lib/nss_wrapper') diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 01b3ce9..8f8a6e8 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -37,11 +37,11 @@ bld.SAMBA_MODULE('cyrus_sasl', bld.SAMBA_MODULE('gensec_spnego', - source='spnego.c ../../../libcli/auth/spnego_parse.c', + source='spnego.c', autoproto='spnego_proto.h', subsystem='gensec', init_function='gensec_spnego_init', - deps='ASN1_UTIL credentials' + deps='ASN1_UTIL credentials SPNEGO_PARSE' ) diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index f7f167f..2f0372a 100644 --- a/source4/lib/registry/wscript_build +++ b/source4/lib/registry/wscript_build @@ -11,9 +11,9 @@ bld.SAMBA_SUBSYSTEM('TDR_REGF', bld.SAMBA_LIBRARY('registry', - source='interface.c ../../../libcli/registry/util_reg.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c', + source='interface.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c', pc_files='registry.pc', - public_deps='samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba', + public_deps='samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba util_reg', public_headers='registry.h', vnum='0.0.1' ) diff --git a/wscript_build b/wscript_build index a35ac9b..318020c 100644 --- a/wscript_build +++ b/wscript_build @@ -96,6 +96,7 @@ bld.RECURSE('libcli/auth') bld.RECURSE('libcli/drsuapi') bld.RECURSE('libcli/echo') bld.RECURSE('libcli/samsync') +bld.RECURSE('libcli/registry') bld.RECURSE('source4/lib/policy') bld.RECURSE('libcli/named_pipe_auth') bld.RECURSE('source4/heimdal_build') -- Samba Shared Repository