[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-967-g1df883a
Stefan Metzmacher
metze at samba.org
Wed Aug 12 10:29:19 MDT 2009
The branch, master has been updated
via 1df883aa39ce69b040f9d9e72125bf4b80c714a9 (commit)
from 31e57ab1e5d676a60fada9b3de7acdf3fd415dbb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1df883aa39ce69b040f9d9e72125bf4b80c714a9
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 12 17:52:55 2009 +0200
libcli: move some common SMB and SMB2 stuff into libcli/smb/
This will hold code that's shared between source3 and source4.
metze
-----------------------------------------------------------------------
Summary of changes:
.../libcli/smb2 => libcli/smb}/smb2_constants.h | 0
.../smb/smb_common.h | 25 +++++++++----------
source3/smbd/smb2_break.c | 2 +-
source3/smbd/smb2_close.c | 2 +-
source3/smbd/smb2_create.c | 2 +-
source3/smbd/smb2_find.c | 2 +-
source3/smbd/smb2_flush.c | 2 +-
source3/smbd/smb2_getinfo.c | 2 +-
source3/smbd/smb2_glue.c | 2 +-
source3/smbd/smb2_ioctl.c | 2 +-
source3/smbd/smb2_keepalive.c | 2 +-
source3/smbd/smb2_lock.c | 2 +-
source3/smbd/smb2_negprot.c | 2 +-
source3/smbd/smb2_notify.c | 2 +-
source3/smbd/smb2_read.c | 2 +-
source3/smbd/smb2_server.c | 2 +-
source3/smbd/smb2_sesssetup.c | 2 +-
source3/smbd/smb2_setinfo.c | 2 +-
source3/smbd/smb2_signing.c | 2 +-
source3/smbd/smb2_tcon.c | 2 +-
source3/smbd/smb2_write.c | 2 +-
source4/libcli/raw/interfaces.h | 2 +-
source4/libcli/smb2/smb2.h | 1 -
23 files changed, 32 insertions(+), 34 deletions(-)
rename {source4/libcli/smb2 => libcli/smb}/smb2_constants.h (100%)
copy source4/libnet/libnet_export_keytab.h => libcli/smb/smb_common.h (77%)
Changeset truncated at 500 lines:
diff --git a/source4/libcli/smb2/smb2_constants.h b/libcli/smb/smb2_constants.h
similarity index 100%
rename from source4/libcli/smb2/smb2_constants.h
rename to libcli/smb/smb2_constants.h
diff --git a/source4/libnet/libnet_export_keytab.h b/libcli/smb/smb_common.h
similarity index 77%
copy from source4/libnet/libnet_export_keytab.h
copy to libcli/smb/smb_common.h
index 194f890..f5994d4 100644
--- a/source4/libnet/libnet_export_keytab.h
+++ b/libcli/smb/smb_common.h
@@ -1,28 +1,27 @@
-/*
+/*
Unix SMB/CIFS implementation.
- Copyright (C) Andrew Bartlett <abartlet at samba.org> 2009
-
+ SMB and SMB2 common header
+
+ Copyright (C) Stefan Metzmacher 2009
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-struct libnet_export_keytab {
- struct {
- const char *keytab_name;
- } in;
- struct {
- const char *error_string;
- } out;
-};
+#ifndef __LIBCLI_SMB_SMB_COMMON_H__
+#define __LIBCLI_SMB_SMB_COMMON_H__
+
+#include "../libcli/smb/smb2_constants.h"
+#endif
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index 29c55fc..449b8f6 100644
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_oplock_break_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index acb5da7..b28fb72 100644
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
uint16_t in_flags,
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index fe414bb..43b1fcb 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index 59c0a67..f28ae19 100644
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c
index e053852..bfdb2d8 100644
--- a/source3/smbd/smb2_flush.c
+++ b/source3/smbd/smb2_flush.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_flush_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index cd612d1..1c247d7 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index 5fa3bd2..d5a6217 100644
--- a/source3/smbd/smb2_glue.c
+++ b/source3/smbd/smb2_glue.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req)
{
diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index aa93ca3..333616a 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_keepalive.c b/source3/smbd/smb2_keepalive.c
index 0028fd3..6645a00 100644
--- a/source3/smbd/smb2_keepalive.c
+++ b/source3/smbd/smb2_keepalive.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req)
{
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index d515f18..eab95f6 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
struct smbd_smb2_lock_element {
uint64_t offset;
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index a60ea63..2c6449d 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
extern enum protocol_types Protocol;
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index dbcdbac..390bb57 100644
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_notify_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 1756c15..0b46567 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 85b3573..1b22c82 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
#include "../lib/tsocket/tsocket.h"
bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size)
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 9b1dc8c..4724516 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req,
uint64_t in_session_id,
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 996b190..5cb6714 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_signing.c b/source3/smbd/smb2_signing.c
index e584dd9..a7d2605 100644
--- a/source3/smbd/smb2_signing.c
+++ b/source3/smbd/smb2_signing.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
#include "../lib/crypto/crypto.h"
NTSTATUS smb2_signing_sign_pdu(DATA_BLOB session_key,
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 4ed3fb5..7d627c2 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
const char *in_path,
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 2151d22..d9fa46f 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
-#include "../source4/libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 75b7175..ad5f5bf 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -23,7 +23,7 @@
#define __LIBCLI_RAW_INTERFACES_H__
#include "libcli/raw/smb.h"
-#include "libcli/smb2/smb2_constants.h"
+#include "../libcli/smb/smb_common.h"
#include "librpc/gen_ndr/misc.h" /* for struct GUID */
/* this structure is just a wrapper for a string, the only reason we
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 6372cd8..fdd2d6f 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -24,7 +24,6 @@
#include "libcli/raw/request.h"
#include "libcli/raw/libcliraw.h"
-#include "libcli/smb2/smb2_constants.h"
struct smb2_handle;
struct smb2_lease_break;
--
Samba Shared Repository
More information about the samba-cvs
mailing list