[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed Feb 23 18:43:02 MST 2011
The branch, master has been updated
via 5ec284d build: moved librpc/rpc/*.c into a rpccommon library
via 52fe20c build: moved lmhosts.c into a common subsystem
via 94c04b1 build: moved libds/common/flag_mapping.c into a common subsystem
via 8dbe665 build: moved schannel_sign.c into a shared COMMON_SCHANNEL subsystem
via d37a555 build: moved libcli/auth/ntlmssp*.c into a common libcliauth.so library
from 29f850a s3-docs: document all wbinfo options.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5ec284d15289c5716114bff99a19890abbd45fb3
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Feb 24 11:55:45 2011 +1100
build: moved librpc/rpc/*.c into a rpccommon library
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Thu Feb 24 02:42:37 CET 2011 on sn-devel-104
commit 52fe20c3103bbdec72f95344f07dd98b0fa915ce
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Feb 24 11:33:09 2011 +1100
build: moved lmhosts.c into a common subsystem
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 94c04b10db5032d83c21ea6eb8665bf930e81a9f
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Feb 24 11:23:53 2011 +1100
build: moved libds/common/flag_mapping.c into a common subsystem
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 8dbe665a0c0870aeb298b8f0d5a8a1a05e21a719
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Feb 24 10:36:55 2011 +1100
build: moved schannel_sign.c into a shared COMMON_SCHANNEL subsystem
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit d37a55548b67e4e5693d337faeca2ec2da5f273f
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Feb 24 10:28:43 2011 +1100
build: moved libcli/auth/ntlmssp*.c into a common libcliauth.so library
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/auth/wscript_build | 19 ++++--
libcli/nbt/wscript_build | 8 ++-
libds/common/flag_mapping.c | 1 +
libds/common/flag_mapping.h | 13 ++++
libds/common/wscript_build | 3 +
librpc/rpc/binding.c | 2 +
librpc/rpc/binding_handle.c | 1 +
librpc/rpc/dcerpc_error.c | 1 +
librpc/rpc/dcerpc_util.c | 1 +
librpc/rpc/rpc_common.h | 101 +++++++++++++++++++++++++++++++
librpc/wscript_build | 5 ++
source3/wscript_build | 41 +++++--------
source4/auth/gensec/wscript_build | 4 +-
source4/auth/ntlm/wscript_build | 2 +-
source4/auth/ntlmssp/ntlmssp_client.c | 1 +
source4/auth/ntlmssp/wscript_build | 8 +--
source4/cldap_server/netlogon.c | 1 +
source4/dsdb/common/util.c | 1 +
source4/dsdb/common/util_samr.c | 2 +
source4/dsdb/samdb/ldb_modules/samldb.c | 1 +
source4/dsdb/wscript_build | 4 +-
source4/librpc/rpc/dcerpc.c | 1 +
source4/librpc/rpc/dcerpc_smb.c | 1 +
source4/librpc/rpc/dcerpc_smb2.c | 1 +
source4/librpc/rpc/dcerpc_sock.c | 1 +
source4/librpc/rpc/dcerpc_util.c | 1 +
source4/librpc/wscript_build | 6 +-
source4/rpc_server/common/reply.c | 1 +
source4/rpc_server/dcerpc_server.c | 1 +
source4/rpc_server/dcesrv_auth.c | 1 +
source4/rpc_server/lsa/lsa_lookup.c | 1 +
source4/rpc_server/samr/dcesrv_samr.c | 1 +
source4/rpc_server/wscript_build | 2 +-
source4/smbd/wscript_build | 2 +-
source4/torture/rpc/epmapper.c | 1 +
source4/utils/wscript_build | 3 +-
wscript_build | 1 +
37 files changed, 192 insertions(+), 53 deletions(-)
create mode 100644 libds/common/flag_mapping.h
create mode 100644 libds/common/wscript_build
create mode 100644 librpc/rpc/rpc_common.h
Changeset truncated at 500 lines:
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 15f8f64..3d9e8e6 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -1,9 +1,14 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('ntlm_check',
- source='ntlm_check.c',
- deps='samba-util'
- )
+bld.SAMBA_LIBRARY('cliauth',
+ source='',
+ deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS',
+ private_library=True,
+ grouping_library=True)
+
+bld.SAMBA_SUBSYSTEM('NTLMSSP_COMMON',
+ source='ntlmssp.c ntlmssp_ndr.c ntlmssp_server.c ntlmssp_sign.c ntlm_check.c',
+ deps='samba-util NDR_NTLMSSP MSRPC_PARSE')
bld.SAMBA_SUBSYSTEM('MSRPC_PARSE',
@@ -19,9 +24,9 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
)
-bld.SAMBA_SUBSYSTEM('COMMON_SCHANNELDB',
- source='schannel_state_tdb.c',
- deps='tdb-wrap'
+bld.SAMBA_SUBSYSTEM('COMMON_SCHANNEL',
+ source='schannel_state_tdb.c schannel_sign.c',
+ deps='tdb-wrap UTIL_TDB'
)
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 7e30470..6227482 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -6,11 +6,15 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
autoproto='nbtname.h'
)
+bld.SAMBA_SUBSYSTEM('lmhosts',
+ source='lmhosts.c',
+ deps='replace')
+
if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('cli-nbt',
- source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c',
- public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util',
+ source='nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c',
+ public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util lmhosts',
private_library=True
)
diff --git a/libds/common/flag_mapping.c b/libds/common/flag_mapping.c
index 99421ed..471afd0 100644
--- a/libds/common/flag_mapping.c
+++ b/libds/common/flag_mapping.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "librpc/gen_ndr/samr.h"
#include "../libds/common/flags.h"
+#include "flag_mapping.h"
/*
translated the ACB_CTRL Flags to UserFlags (userAccountControl)
diff --git a/libds/common/flag_mapping.h b/libds/common/flag_mapping.h
new file mode 100644
index 0000000..4b1cc3b
--- /dev/null
+++ b/libds/common/flag_mapping.h
@@ -0,0 +1,13 @@
+#ifndef __LIBDS_COMMON_FLAG_MAPPING_H__
+#define __LIBDS_COMMON_FLAG_MAPPING_H__
+
+/* The following definitions come from flag_mapping.c */
+
+uint32_t ds_acb2uf(uint32_t acb);
+uint32_t ds_uf2acb(uint32_t uf);
+uint32_t ds_uf2atype(uint32_t uf);
+uint32_t ds_gtype2atype(uint32_t gtype);
+enum lsa_SidType ds_atype_map(uint32_t atype);
+uint32_t ds_uf2prim_group_rid(uint32_t uf);
+
+#endif /* __LIBDS_COMMON_FLAG_MAPPING_H__ */
diff --git a/libds/common/wscript_build b/libds/common/wscript_build
new file mode 100644
index 0000000..46787db
--- /dev/null
+++ b/libds/common/wscript_build
@@ -0,0 +1,3 @@
+
+bld.SAMBA_SUBSYSTEM('flag_mapping',
+ source='flag_mapping.c')
diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index b7c3a40..2a0295b 100644
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -27,6 +27,8 @@
#include "librpc/gen_ndr/ndr_epmapper.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/rpc/dcerpc.h"
+#include "rpc_common.h"
+
#undef strcasecmp
#undef strncasecmp
diff --git a/librpc/rpc/binding_handle.c b/librpc/rpc/binding_handle.c
index 93c0fd4..9ad7a9b 100644
--- a/librpc/rpc/binding_handle.c
+++ b/librpc/rpc/binding_handle.c
@@ -23,6 +23,7 @@
#include <tevent.h>
#include "../lib/util/tevent_ntstatus.h"
#include "librpc/rpc/dcerpc.h"
+#include "rpc_common.h"
struct dcerpc_binding_handle {
void *private_data;
diff --git a/librpc/rpc/dcerpc_error.c b/librpc/rpc/dcerpc_error.c
index 17095e5..7c98386 100644
--- a/librpc/rpc/dcerpc_error.c
+++ b/librpc/rpc/dcerpc_error.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "librpc/rpc/dcerpc.h"
+#include "rpc_common.h"
struct dcerpc_fault_table {
const char *errstr;
diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c
index 1db43df..a405ca8 100644
--- a/librpc/rpc/dcerpc_util.c
+++ b/librpc/rpc/dcerpc_util.c
@@ -26,6 +26,7 @@
#include "lib/util/tevent_ntstatus.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "rpc_common.h"
/* we need to be able to get/set the fragment length without doing a full
decode */
diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
new file mode 100644
index 0000000..3f5216b
--- /dev/null
+++ b/librpc/rpc/rpc_common.h
@@ -0,0 +1,101 @@
+#ifndef __DEFAULT_LIBRPC_RPCCOMMON_H__
+#define __DEFAULT_LIBRPC_RPCCOMMON_H__
+
+/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
+
+
+/* The following definitions come from ../librpc/rpc/binding.c */
+
+const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
+const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
+enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
+
+/* The following definitions come from ../librpc/rpc/dcerpc_util.c */
+
+void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v);
+uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob);
+void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v);
+uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);
+
+/**
+* @brief Pull a dcerpc_auth structure, taking account of any auth
+* padding in the blob. For request/response packets we pass
+* the whole data blob, so auth_data_only must be set to false
+* as the blob contains data+pad+auth and no just pad+auth.
+*
+* @param pkt - The ncacn_packet strcuture
+* @param mem_ctx - The mem_ctx used to allocate dcerpc_auth elements
+* @param pkt_trailer - The packet trailer data, usually the trailing
+* auth_info blob, but in the request/response case
+* this is the stub_and_verifier blob.
+* @param auth - A preallocated dcerpc_auth *empty* structure
+* @param auth_length - The length of the auth trail, sum of auth header
+* lenght and pkt->auth_length
+* @param auth_data_only - Whether the pkt_trailer includes only the auth_blob
+* (+ padding) or also other data.
+*
+* @return - A NTSTATUS error code.
+*/
+NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
+ TALLOC_CTX *mem_ctx,
+ DATA_BLOB *pkt_trailer,
+ struct dcerpc_auth *auth,
+ uint32_t *auth_length,
+ bool auth_data_only);
+struct tevent_req *dcerpc_read_ncacn_packet_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct tstream_context *stream);
+NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req *req,
+ TALLOC_CTX *mem_ctx,
+ struct ncacn_packet **pkt,
+ DATA_BLOB *buffer);
+
+/* The following definitions come from ../librpc/rpc/binding_handle.c */
+
+struct dcerpc_binding_handle *_dcerpc_binding_handle_create(TALLOC_CTX *mem_ctx,
+ const struct dcerpc_binding_handle_ops *ops,
+ const struct GUID *object,
+ const struct ndr_interface_table *table,
+ void *pstate,
+ size_t psize,
+ const char *type,
+ const char *location);
+void *_dcerpc_binding_handle_data(struct dcerpc_binding_handle *h);
+void dcerpc_binding_handle_set_sync_ev(struct dcerpc_binding_handle *h,
+ struct tevent_context *ev);
+bool dcerpc_binding_handle_is_connected(struct dcerpc_binding_handle *h);
+uint32_t dcerpc_binding_handle_set_timeout(struct dcerpc_binding_handle *h,
+ uint32_t timeout);
+struct tevent_req *dcerpc_binding_handle_raw_call_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct dcerpc_binding_handle *h,
+ const struct GUID *object,
+ uint32_t opnum,
+ uint32_t in_flags,
+ const uint8_t *in_data,
+ size_t in_length);
+NTSTATUS dcerpc_binding_handle_raw_call_recv(struct tevent_req *req,
+ TALLOC_CTX *mem_ctx,
+ uint8_t **out_data,
+ size_t *out_length,
+ uint32_t *out_flags);
+struct tevent_req *dcerpc_binding_handle_disconnect_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct dcerpc_binding_handle *h);
+NTSTATUS dcerpc_binding_handle_disconnect_recv(struct tevent_req *req);
+struct tevent_req *dcerpc_binding_handle_call_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct dcerpc_binding_handle *h,
+ const struct GUID *object,
+ const struct ndr_interface_table *table,
+ uint32_t opnum,
+ TALLOC_CTX *r_mem,
+ void *r_ptr);
+NTSTATUS dcerpc_binding_handle_call_recv(struct tevent_req *req);
+NTSTATUS dcerpc_binding_handle_call(struct dcerpc_binding_handle *h,
+ const struct GUID *object,
+ const struct ndr_interface_table *table,
+ uint32_t opnum,
+ TALLOC_CTX *r_mem,
+ void *r_ptr);
+#endif /* __DEFAULT_LIBRPC_RPCCOMMON_H__ */
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 1c41af3..354dec1 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -565,3 +565,8 @@ bld.SAMBA_LIBRARY('ndr',
depends_on='PIDL_MISC',
vnum='0.0.1'
)
+
+bld.SAMBA_LIBRARY('rpccommon',
+ source='rpc/dcerpc_error.c rpc/binding.c rpc/dcerpc_util.c rpc/binding_handle.c',
+ deps='ndr tevent NDR_DCERPC LIBTSOCKET',
+ private_library=True)
diff --git a/source3/wscript_build b/source3/wscript_build
index 657a866..0008bd0 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -63,7 +63,6 @@ LIB_SRC = '''
lib/interface.c lib/pidfile.c
lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
- ../libds/common/flag_mapping.c
lib/access.c lib/smbrun.c
lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
lib/wins_srv.c
@@ -120,25 +119,15 @@ SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
passdb/machine_sid.c'''
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
- libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
+ libsmb/namequery.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-
-LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
-
LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
- libsmb/ntlmssp_wrap.c
- ../libcli/auth/ntlmssp.c
- ../libcli/auth/ntlmssp_sign.c
- ../libcli/auth/ntlmssp_ndr.c
- ../libcli/auth/ntlmssp_server.c'''
+ libsmb/ntlmssp_wrap.c'''
TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
-SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
-
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clispnego.c
libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
@@ -151,7 +140,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/smbsock_connect.c'''
LIBMSRPC_SRC = '''
- ${SCHANNEL_SRC}
rpc_client/cli_pipe.c
librpc/crypto/gse_krb5.c
librpc/crypto/gse.c
@@ -160,10 +148,8 @@ LIBMSRPC_SRC = '''
rpc_client/rpc_transport_np.c
rpc_client/rpc_transport_sock.c
rpc_client/rpc_transport_tstream.c
- ../librpc/rpc/binding.c
- ../librpc/rpc/dcerpc_util.c
librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c'''
+ '''
#
# registry-related objects
@@ -691,8 +677,8 @@ bld.SAMBA3_LIBRARY('nss_wins',
bld.SAMBA3_SUBSYSTEM('msrpc3',
source='${LIBMSRPC_SRC}',
deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
- RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH
- LIBTSOCKET krb5''',
+ RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH
+ LIBTSOCKET krb5 rpccommon''',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
@@ -719,7 +705,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
bld.SAMBA3_LIBRARY('passdb',
source=PASSDB_SRC,
- deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient',
+ deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH',
private_library=True,
vars=locals())
@@ -771,7 +757,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',
+ 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',
private_library=True,
vars=locals())
@@ -781,13 +767,13 @@ bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
- source=LIBSMB_ERR_SRC,
- deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH',
+ source='',
+ deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
source=LIBNTLMSSP_SRC,
- deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
+ deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBSMB',
@@ -911,8 +897,9 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNMB',
- source=LIBNMB_SRC,
- vars=locals())
+ source=LIBNMB_SRC,
+ deps='lmhosts',
+ vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNBT',
source='',
@@ -1367,6 +1354,7 @@ bld.RECURSE('../lib/util')
bld.RECURSE('../lib/tevent')
bld.RECURSE('../lib/tsocket')
bld.RECURSE('../lib/zlib')
+bld.RECURSE('../libds/common')
bld.RECURSE('../nsswitch')
bld.RECURSE('../nsswitch/libwbclient')
bld.RECURSE('auth')
@@ -1379,6 +1367,7 @@ bld.RECURSE('passdb')
bld.RECURSE('rpc_server')
bld.RECURSE('winbindd')
+
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index e0a518e..01b3ce9 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -46,9 +46,9 @@ bld.SAMBA_MODULE('gensec_spnego',
bld.SAMBA_MODULE('gensec_schannel',
- source='schannel.c ../../../libcli/auth/schannel_sign.c',
+ source='schannel.c',
subsystem='gensec',
- deps='COMMON_SCHANNELDB NDR_SCHANNEL credentials ndr auth_session',
+ deps='COMMON_SCHANNEL NDR_SCHANNEL credentials ndr auth_session',
internal_module=True,
autoproto='schannel_proto.h',
init_function='gensec_schannel_init'
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 615419e..2ac2773 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth4_sam_module',
source='auth_sam.c',
subsystem='auth4',
init_function='auth_sam_init',
- deps='samdb auth4_sam ntlm_check samba-hostconfig'
+ deps='samdb auth4_sam NTLMSSP_COMMON samba-hostconfig'
)
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 1bbd4cc..13827e9 100644
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -28,6 +28,7 @@
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
#include "param/param.h"
+#include "libcli/auth/ntlmssp_private.h"
/*********************************************************************
Client side NTLMSSP
diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build
index 0f18183..9c25aa1 100644
--- a/source4/auth/ntlmssp/wscript_build
+++ b/source4/auth/ntlmssp/wscript_build
@@ -2,15 +2,11 @@
bld.SAMBA_MODULE('gensec_ntlmssp',
source='''ntlmssp.c ntlmssp_sign.c
- ntlmssp_client.c ntlmssp_server.c
- ../../../libcli/auth/ntlmssp_sign.c
- ../../../libcli/auth/ntlmssp_ndr.c
- ../../../libcli/auth/ntlmssp.c
- ../../../libcli/auth/ntlmssp_server.c''',
+ ntlmssp_client.c ntlmssp_server.c''',
autoproto='proto.h',
subsystem='gensec',
init_function='gensec_ntlmssp_init',
- deps='MSRPC_PARSE credentials NDR_NTLMSSP',
+ deps='credentials NTLMSSP_COMMON',
internal_module=True
)
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 4d3ef48..baac3c8 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -36,6 +36,7 @@
#include "lib/socket/netif.h"
#include "param/param.h"
#include "../lib/tsocket/tsocket.h"
+#include "libds/common/flag_mapping.h"
/*
fill in the cldap netlogon union for a given version
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 148a77d..e711a32 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -43,6 +43,7 @@
#include "dsdb/common/util.h"
#include "lib/socket/socket.h"
#include "librpc/gen_ndr/irpc.h"
+#include "libds/common/flag_mapping.h"
/*
search the sam for the specified attributes in a specific domain, filter on
diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index 621c9be..02b412e 100644
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -28,6 +28,8 @@
#include "../libds/common/flags.h"
#include "libcli/security/security.h"
+#include "libds/common/flag_mapping.h"
+
/* Add a user, SAMR style, including the correct transaction
* semantics. Used by the SAMR server and by pdb_samba4 */
--
Samba Shared Repository
More information about the samba-cvs
mailing list