From: David Mulder Date: Fri, 11 Mar 2022 15:50:12 +0000 (-0700) Subject: smbd: Move lanman.c -> smb1_lanman.c X-Git-Tag: tevent-0.12.0~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00b09ce49f9b0ec9153e93dc13e4dd18ca5a19d;p=thirdparty%2Fsamba.git smbd: Move lanman.c -> smb1_lanman.c lanman.c only contains smb1 code. Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 45553362f4e..acb6a63f7fa 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -486,14 +486,6 @@ void send_trans_reply(connection_struct *conn, void reply_trans(struct smb_request *req); void reply_transs(struct smb_request *req); -/* The following definitions come from smbd/lanman.c */ - -void api_reply(connection_struct *conn, uint64_t vuid, - struct smb_request *req, - char *data, char *params, - int tdscnt, int tpscnt, - int mdrcnt, int mprcnt); - /* The following definitions come from smbd/mangle.c */ void mangle_reset_cache(void); diff --git a/source3/smbd/lanman.c b/source3/smbd/smb1_lanman.c similarity index 100% rename from source3/smbd/lanman.c rename to source3/smbd/smb1_lanman.c diff --git a/source3/smbd/smb1_lanman.h b/source3/smbd/smb1_lanman.h new file mode 100644 index 00000000000..9e7ecb41168 --- /dev/null +++ b/source3/smbd/smb1_lanman.h @@ -0,0 +1,28 @@ +/* + Unix SMB/CIFS implementation. + Inter-process communication and named pipe handling + Copyright (C) Andrew Tridgell 1992-1998 + Copyright (C) Jeremy Allison 2007. + + SMB Version handling + Copyright (C) John H Terpstra 1995-1998 + + 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 . + */ + +void api_reply(connection_struct *conn, uint64_t vuid, + struct smb_request *req, + char *data, char *params, + int tdscnt, int tpscnt, + int mdrcnt, int mprcnt); diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h index 7bfe90adb5e..3feecb2a17c 100644 --- a/source3/smbd/smbd.h +++ b/source3/smbd/smbd.h @@ -29,6 +29,7 @@ struct dptr_struct; #if defined(WITH_SMB1SERVER) #include "smbd/smb1_message.h" #include "smbd/smb1_sesssetup.h" +#include "smbd/smb1_lanman.h" #endif struct trans_state { diff --git a/source3/wscript_build b/source3/wscript_build index 5dffae3ab52..7a608d08b60 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -612,7 +612,7 @@ bld.SAMBA3_LIBRARY('smbd_base', smbd/share_access.c smbd/fileio.c smbd/ipc.c - smbd/lanman.c + smbd/smb1_lanman.c smbd/negprot.c smbd/smb1_message.c smbd/nttrans.c