[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Wed Nov 3 03:30:02 MDT 2010
The branch, master has been updated
via 598b565 s4:objectguid LDB module - remove "objectguid_find_attribute"
via 4902b71 s4:RPC server - always set the response pad data in base of the request one
via 5516191 s4:RPC server - cosmetic fixes - indentation, comments
via cb9d048 s4:waf - fix the build on Gentoo platforms
from b028f55 s4-test: if using a system version of ldb, override the ldb modules path
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 598b565980a02a8909e3738c17fc503f83efe45e
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Nov 3 09:39:15 2010 +0100
s4:objectguid LDB module - remove "objectguid_find_attribute"
It's exactly the same as "ldb_msg_find_element".
In addition remove a comment which points out a "fixme" for a semi-async call
since we started to permit them again.
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Wed Nov 3 09:29:46 UTC 2010 on sn-devel-104
commit 4902b71a607a0899d1a2d65b80eebdc121f4ef1d
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Nov 3 09:23:33 2010 +0100
s4:RPC server - always set the response pad data in base of the request one
Otherwise it could remain uninitialised - should fix bug #7769.
commit 5516191e7251c9f47a81702e3199b1af9c099f72
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Nov 3 09:23:00 2010 +0100
s4:RPC server - cosmetic fixes - indentation, comments
commit cb9d048f90a2d1da7134ea7026be3a1a5574a920
Author: Philip M. White <pmw at qnan.org>
Date: Wed Nov 3 08:21:34 2010 +0100
s4:waf - fix the build on Gentoo platforms
Signed-off-by: Matthias Dieter Wallnöfer <mdw at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source4/auth/ntlm/wscript_build | 6 ++++--
source4/dsdb/samdb/ldb_modules/objectguid.c | 18 +-----------------
source4/lib/com/wscript_build | 1 +
source4/ntvfs/wscript_build | 12 ++++++++----
source4/rpc_server/common/reply.c | 5 ++++-
source4/rpc_server/dcerpc_server.c | 4 ++--
source4/rpc_server/dcesrv_auth.c | 9 +++++----
source4/smb_server/wscript_build | 3 ++-
8 files changed, 27 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index ef01f09..a4d1816 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -11,7 +11,8 @@ bld.SAMBA_MODULE('auth_sam_module',
bld.SAMBA_MODULE('auth_anonymous',
source='auth_anonymous.c',
subsystem='auth',
- init_function='auth_anonymous_init'
+ init_function='auth_anonymous_init',
+ deps='talloc'
)
@@ -34,7 +35,8 @@ bld.SAMBA_MODULE('auth_winbind',
bld.SAMBA_MODULE('auth_developer',
source='auth_developer.c',
subsystem='auth',
- init_function='auth_developer_init'
+ init_function='auth_developer_init',
+ deps='talloc'
)
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c
index b5d814e..28d253a 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -35,19 +35,6 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "param/param.h"
-static struct ldb_message_element *objectguid_find_attribute(const struct ldb_message *msg, const char *name)
-{
- unsigned int i;
-
- for (i = 0; i < msg->num_elements; i++) {
- if (ldb_attr_cmp(name, msg->elements[i].name) == 0) {
- return &msg->elements[i];
- }
- }
-
- return NULL;
-}
-
/*
add a time element to a record
*/
@@ -140,7 +127,6 @@ static int objectguid_add(struct ldb_module *module, struct ldb_request *req)
{
struct ldb_context *ldb;
struct ldb_request *down_req;
- struct ldb_message_element *attribute;
struct ldb_message *msg;
struct GUID guid;
uint64_t seq_num;
@@ -157,7 +143,7 @@ static int objectguid_add(struct ldb_module *module, struct ldb_request *req)
return ldb_next_request(module, req);
}
- if ((attribute = objectguid_find_attribute(req->op.add.message, "objectGUID")) != NULL ) {
+ if (ldb_msg_find_element(req->op.add.message, "objectGUID") != NULL) {
return ldb_next_request(module, req);
}
@@ -189,8 +175,6 @@ static int objectguid_add(struct ldb_module *module, struct ldb_request *req)
}
/* Get a sequence number from the backend */
- /* FIXME: ldb_sequence_number is a semi-async call,
- * make sure this function is split and a callback is used */
ret = ldb_sequence_number(ldb, LDB_SEQ_NEXT, &seq_num);
if (ret == LDB_SUCCESS) {
if (add_uint64_element(ldb, msg, "uSNCreated",
diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build
index ad716ef..2794d66 100644
--- a/source4/lib/com/wscript_build
+++ b/source4/lib/com/wscript_build
@@ -19,6 +19,7 @@ bld.SAMBA_SUBSYSTEM('DCOM',
bld.SAMBA_MODULE('com_simple',
source='classes/simple.c',
+ deps='talloc',
subsystem='COM',
init_function='com_simple_init'
)
diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
index 4948d2f..e181334 100644
--- a/source4/ntvfs/wscript_build
+++ b/source4/ntvfs/wscript_build
@@ -25,7 +25,8 @@ bld.SAMBA_MODULE('ntvfs_simple',
source='simple/vfs_simple.c simple/svfs_util.c',
autoproto='simple/proto.h',
subsystem='ntvfs',
- init_function='ntvfs_simple_init'
+ init_function='ntvfs_simple_init',
+ deps='talloc'
)
@@ -33,14 +34,16 @@ bld.SAMBA_MODULE('ntvfs_cifsposix',
source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c',
autoproto='cifs_posix_cli/proto.h',
subsystem='ntvfs',
- init_function='ntvfs_cifs_posix_init'
+ init_function='ntvfs_cifs_posix_init',
+ deps='talloc'
)
bld.SAMBA_MODULE('ntvfs_print',
source='print/vfs_print.c',
subsystem='ntvfs',
- init_function='ntvfs_print_init'
+ init_function='ntvfs_print_init',
+ deps='talloc'
)
@@ -56,7 +59,8 @@ bld.SAMBA_MODULE('ntvfs_ipc',
bld.SAMBA_MODULE('ntvfs_nbench',
source='nbench/vfs_nbench.c',
subsystem='ntvfs',
- init_function='ntvfs_nbench_init'
+ init_function='ntvfs_nbench_init',
+ deps='talloc'
)
diff --git a/source4/rpc_server/common/reply.c b/source4/rpc_server/common/reply.c
index d883317..83660c2 100644
--- a/source4/rpc_server/common/reply.c
+++ b/source4/rpc_server/common/reply.c
@@ -206,7 +206,8 @@ _PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
length = MIN(chunk_size, stub.length);
/* form the dcerpc response packet */
- dcesrv_init_hdr(&pkt, lpcfg_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
+ dcesrv_init_hdr(&pkt,
+ lpcfg_rpc_big_endian(call->conn->dce_ctx->lp_ctx));
pkt.auth_length = 0;
pkt.call_id = call->pkt.call_id;
pkt.ptype = DCERPC_PKT_RESPONSE;
@@ -220,6 +221,8 @@ _PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
pkt.u.response.alloc_hint = stub.length;
pkt.u.response.context_id = call->pkt.u.request.context_id;
pkt.u.response.cancel_count = 0;
+ pkt.u.response._pad.data = call->pkt.u.request._pad.data;
+ pkt.u.response._pad.length = call->pkt.u.request._pad.length;
pkt.u.response.stub_and_verifier.data = stub.data;
pkt.u.response.stub_and_verifier.length = length;
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 0dc00e5..061d8e8 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1046,8 +1046,8 @@ NTSTATUS dcesrv_process_ncacn_packet(struct dcesrv_connection *dce_conn,
return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
}
- /* this is a continuation of an existing call - find the call then
- tack it on the end */
+ /* this is a continuation of an existing call - find the call
+ then tack it on the end */
call = dcesrv_find_fragmented_call(dce_conn, call2->pkt.call_id);
if (!call) {
return dcesrv_fault(call2, DCERPC_FAULT_OTHER);
diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index c7f3cde..4c91fcb 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -395,8 +395,8 @@ bool dcesrv_auth_response(struct dcesrv_call_state *call,
case DCERPC_AUTH_LEVEL_CONNECT:
/*
- * TODO: let the gensec mech decide if it wants to generate a signature
- * that might be needed for schannel...
+ * TODO: let the gensec mech decide if it wants to generate a
+ * signature that might be needed for schannel...
*/
status = ncacn_push_auth(blob, call, pkt, NULL);
return NT_STATUS_IS_OK(status);
@@ -430,7 +430,8 @@ bool dcesrv_auth_response(struct dcesrv_call_state *call,
of the stub */
dce_conn->auth_state.auth_info->auth_pad_length =
(16 - (pkt->u.response.stub_and_verifier.length & 15)) & 15;
- ndr_err = ndr_push_zero(ndr, dce_conn->auth_state.auth_info->auth_pad_length);
+ ndr_err = ndr_push_zero(ndr,
+ dce_conn->auth_state.auth_info->auth_pad_length);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return false;
}
@@ -443,7 +444,7 @@ bool dcesrv_auth_response(struct dcesrv_call_state *call,
/* add the auth verifier */
ndr_err = ndr_push_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS,
- dce_conn->auth_state.auth_info);
+ dce_conn->auth_state.auth_info);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return false;
}
diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build
index 3ecbf24..7ccfeec 100644
--- a/source4/smb_server/wscript_build
+++ b/source4/smb_server/wscript_build
@@ -13,7 +13,8 @@ bld.SAMBA_MODULE('SERVICE_SMB',
bld.SAMBA_MODULE('SERVICE_SAMBA3_SMB',
source='smb_samba3.c',
subsystem='service',
- init_function='server_service_samba3_smb_init'
+ init_function='server_service_samba3_smb_init',
+ deps='talloc'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list