smbd: Move sesssetup.c -> smb1_sesssetup.c

sesssetup.c only contains smb1 code.

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 700eddcc7f699f2d77c738a7455abbb6a3bd349a..45553362f4e3fa849d906861850ea129bdf32108 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1132,10 +1132,6 @@ int list_sessions(TALLOC_CTX *mem_ctx, struct sessionid **session_list);
 int find_sessions(TALLOC_CTX *mem_ctx, const char *username,
                  const char *machine, struct sessionid **session_list);
 
-/* The following definitions come from smbd/sesssetup.c  */
-
-void reply_sesssetup_and_X(struct smb_request *req);
-
 /* The following definitions come from smbd/share_access.c  */
 
 bool token_contains_name_in_list(const char *username,

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/smb1_sesssetup.c
similarity index 100%
rename from source3/smbd/sesssetup.c
rename to source3/smbd/smb1_sesssetup.c

diff --git a/source3/smbd/smb1_sesssetup.h b/source3/smbd/smb1_sesssetup.h
new file mode 100644 (file)
index 0000000..6f1324a
--- /dev/null
+++ b/source3/smbd/smb1_sesssetup.h
@@ -0,0 +1,25 @@
+/*
+   Unix SMB/CIFS implementation.
+   handle SMBsessionsetup
+   Copyright (C) Andrew Tridgell 1998-2001
+   Copyright (C) Andrew Bartlett      2001
+   Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002
+   Copyright (C) Luke Howard          2003
+   Copyright (C) Volker Lendecke      2007
+   Copyright (C) Jeremy Allison              2007
+
+   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/>.
+*/
+
+void reply_sesssetup_and_X(struct smb_request *req);

diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h
index feabb5e834c3acc6b466e8ed600076eaf7e1bdf4..7bfe90adb5e15cdadf54f27db099639ebb58eeee 100644 (file)
--- a/source3/smbd/smbd.h
+++ b/source3/smbd/smbd.h
@@ -28,6 +28,7 @@ struct dptr_struct;
 #include "smbd/fd_handle.h"
 #if defined(WITH_SMB1SERVER)
 #include "smbd/smb1_message.h"
+#include "smbd/smb1_sesssetup.h"
 #endif
 
 struct trans_state {

diff --git a/source3/wscript_build b/source3/wscript_build
index 9e1b93e38badeaaf6814a5138347fbe589b5ebd2..5dffae3ab52097921104c416c2166bd4926258c8 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -618,7 +618,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/nttrans.c
                           smbd/pipes.c
                           smbd/reply.c
-                          smbd/sesssetup.c
+                          smbd/smb1_sesssetup.c
                           smbd/trans2.c
                           smbd/uid.c
                           smbd/dosmode.c