The branch, master has been updated
via 8cca7b0 s3:smb2_server: remember the request_time on an incoming
request
via d8b3687 s3:smbd: remember the request_time on an incoming request
via 59733d9 heimdal:lib/hdb: <config.h> needs to be the first header
via 8d3a291 auth.idl: mark confidential attributes as [noprint]
from b27f888 s3:vfs: change files_struct.fnum from int to uint64_t
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8cca7b09ad349e8d549eb326cdd2362cf3843773
Author: Stefan Metzmacher <[email protected]>
Date: Wed Apr 11 16:54:17 2012 +0200
s3:smb2_server: remember the request_time on an incoming request
metze
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Fri Jun 15 09:17:33 CEST 2012 on sn-devel-104
commit d8b3687fcbb2ac37bf93b23301da4bf4d79301f6
Author: Stefan Metzmacher <[email protected]>
Date: Wed Apr 11 16:54:17 2012 +0200
s3:smbd: remember the request_time on an incoming request
metze
commit 59733d911bf9010c7356641d171667a09fc32afb
Author: Stefan Metzmacher <[email protected]>
Date: Thu Jun 14 22:15:24 2012 +0200
heimdal:lib/hdb: <config.h> needs to be the first header
This should fix build problems on AIX.
metze
commit 8d3a2914d8dfae4b9e4e9537aea87748d5456bb4
Author: Stefan Metzmacher <[email protected]>
Date: Thu Jun 14 17:52:23 2012 +0200
auth.idl: mark confidential attributes as [noprint]
We should allow NDR_PRINT_DEBUG() to log them.
TODO: we could add some more magic which logs it at level 100.
metze
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/auth.idl | 8 ++++----
source3/include/vfs.h | 2 ++
source3/smbd/globals.h | 2 ++
source3/smbd/process.c | 4 ++++
source3/smbd/smb2_glue.c | 1 +
source3/smbd/smb2_server.c | 2 ++
source4/heimdal/lib/hdb/hdb_locl.h | 4 ++--
7 files changed, 17 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/auth.idl b/librpc/idl/auth.idl
index 2451d2b..b0494f9 100644
--- a/librpc/idl/auth.idl
+++ b/librpc/idl/auth.idl
@@ -83,8 +83,8 @@ interface auth
uint32 num_sids;
[size_is(num_sids)] dom_sid sids[*];
auth_user_info *info;
- DATA_BLOB user_session_key;
- DATA_BLOB lm_session_key;
+ [noprint] DATA_BLOB user_session_key;
+ [noprint] DATA_BLOB lm_session_key;
} auth_user_info_dc;
typedef [public] struct {
@@ -104,13 +104,13 @@ interface auth
* Bottom line, it is not the same as the session keys in info3.
*/
- DATA_BLOB session_key;
+ [noprint] DATA_BLOB session_key;
[value(NULL), ignore] cli_credentials *credentials;
} auth_session_info;
typedef [public] struct {
auth_session_info *session_info;
- DATA_BLOB exported_gssapi_credentials;
+ [noprint] DATA_BLOB exported_gssapi_credentials;
} auth_session_info_transport;
}
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 723eb6c..e6a9ef4 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -399,6 +399,8 @@ struct smb_request {
* Request list for chained requests, we're part of it.
*/
struct smb_request **chain;
+
+ struct timeval request_time;
};
/*
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index a0d5be0..8113b8e 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -379,6 +379,8 @@ struct smbd_smb2_request {
bool cancelled;
bool compound_related;
+ struct timeval request_time;
+
/* fake smb1 request. */
struct smb_request *smb1req;
struct files_struct *compat_chain_fsp;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 5e26826..9e1abb2 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -517,12 +517,16 @@ static bool init_smb_request(struct smb_request *req,
uint32_t seqnum)
{
size_t req_size = smb_len(inbuf) + 4;
+
/* Ensure we have at least smb_size bytes. */
if (req_size < smb_size) {
DEBUG(0,("init_smb_request: invalid request size %u\n",
(unsigned int)req_size ));
return false;
}
+
+ req->request_time = timeval_current();
+
req->cmd = CVAL(inbuf, smb_com);
req->flags2 = SVAL(inbuf, smb_flg2);
req->smbpid = SVAL(inbuf, smb_pid);
diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index 360a73a..a71679f 100644
--- a/source3/smbd/smb2_glue.c
+++ b/source3/smbd/smb2_glue.c
@@ -36,6 +36,7 @@ struct smb_request *smbd_smb2_fake_smb_request(struct
smbd_smb2_request *req)
return NULL;
}
+ smbreq->request_time = req->request_time;
smbreq->vuid = req->session->compat_vuser->vuid;
smbreq->tid = req->tcon->compat_conn->cnum;
smbreq->conn = req->tcon->compat_conn;
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 3cee931..5d30aa4 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -571,6 +571,8 @@ static NTSTATUS smbd_smb2_request_setup_out(struct
smbd_smb2_request *req)
int count;
int idx;
+ req->request_time = timeval_current();
+
count = req->in.vector_count;
vector = talloc_zero_array(req, struct iovec, count);
if (vector == NULL) {
diff --git a/source4/heimdal/lib/hdb/hdb_locl.h
b/source4/heimdal/lib/hdb/hdb_locl.h
index c210b98..fd7b184 100644
--- a/source4/heimdal/lib/hdb/hdb_locl.h
+++ b/source4/heimdal/lib/hdb/hdb_locl.h
@@ -36,11 +36,11 @@
#ifndef __HDB_LOCL_H__
#define __HDB_LOCL_H__
+#include <config.h>
+
#include <assert.h>
#include <heimbase.h>
-#include <config.h>
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
--
Samba Shared Repository
