From 1df883aa39ce69b040f9d9e72125bf4b80c714a9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 12 Aug 2009 17:52:55 +0200 Subject: [PATCH] libcli: move some common SMB and SMB2 stuff into libcli/smb/ This will hold code that's shared between source3 and source4. metze --- .../smb2 => libcli/smb}/smb2_constants.h | 0 libcli/smb/smb_common.h | 27 +++++++++++++++++++ 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, 47 insertions(+), 21 deletions(-) rename {source4/libcli/smb2 => libcli/smb}/smb2_constants.h (100%) create mode 100644 libcli/smb/smb_common.h 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/libcli/smb/smb_common.h b/libcli/smb/smb_common.h new file mode 100644 index 00000000000..f5994d41057 --- /dev/null +++ b/libcli/smb/smb_common.h @@ -0,0 +1,27 @@ +/* + Unix SMB/CIFS implementation. + + 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 . +*/ + +#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 29c55fccf6a..449b8f6f4d7 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 acb5da77513..b28fb729793 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 fe414bb8979..43b1fcb43de 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 59c0a67ceb2..f28ae1974b8 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 e0538529cf2..bfdb2d87384 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 cd612d1085c..1c247d7a0c5 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 5fa3bd22499..d5a6217aa31 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 aa93ca38ced..333616ab614 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 0028fd36084..6645a00dad8 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 d515f18eda3..eab95f666db 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 a60ea63b009..2c6449dbaa8 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 dbcdbac99a4..390bb578a43 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 1756c158721..0b46567d607 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 85b3573eb04..1b22c827245 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 9b1dc8cdf88..4724516f2e4 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 996b190ffde..5cb6714477f 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 e584dd91ca6..a7d2605318a 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 4ed3fb56860..7d627c2dfa2 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 2151d22e9f3..d9fa46f5cab 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 75b7175ac33..ad5f5bf2237 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 6372cd805b4..fdd2d6f6fc2 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; -- 2.34.1