summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/smbd/proto.h4
-rw-r--r--source3/smbd/smb1_negprot.c (renamed from source3/smbd/negprot.c)0
-rw-r--r--source3/smbd/smb1_negprot.h21
-rw-r--r--source3/smbd/smbd.h1
-rw-r--r--source3/wscript_build2
5 files changed, 23 insertions, 5 deletions
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index e58a6630ed5..5280c486885 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -580,10 +580,6 @@ NTSTATUS create_conn_struct_tos_cwd(struct messaging_context *msg,
const struct auth_session_info *session_info,
struct conn_struct_tos **_c);
-/* The following definitions come from smbd/negprot.c */
-
-void reply_negprot(struct smb_request *req);
-
/* The following definitions come from smbd/notify.c */
bool change_notify_fsp_has_changes(struct files_struct *fsp);
diff --git a/source3/smbd/negprot.c b/source3/smbd/smb1_negprot.c
index e893bf28b0a..e893bf28b0a 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/smb1_negprot.c
diff --git a/source3/smbd/smb1_negprot.h b/source3/smbd/smb1_negprot.h
new file mode 100644
index 00000000000..2b23a0436de
--- /dev/null
+++ b/source3/smbd/smb1_negprot.h
@@ -0,0 +1,21 @@
+/*
+ Unix SMB/CIFS implementation.
+ negprot reply code
+ Copyright (C) Andrew Tridgell 1992-1998
+ Copyright (C) Volker Lendecke 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_negprot(struct smb_request *req);
diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h
index 1e55a4df73a..2b63da4a798 100644
--- a/source3/smbd/smbd.h
+++ b/source3/smbd/smbd.h
@@ -32,6 +32,7 @@ struct dptr_struct;
#include "smbd/smb1_lanman.h"
#include "smbd/smb1_aio.h"
#include "smbd/smb1_ipc.h"
+#include "smbd/smb1_negprot.h"
#endif
struct trans_state {
diff --git a/source3/wscript_build b/source3/wscript_build
index 4cf84176e5f..a2d1e47c366 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -605,6 +605,7 @@ if bld.CONFIG_SET('WITH_SMB1SERVER'):
smbd/smb1_utils.c
smbd/smb1_aio.c
smbd/smb1_ipc.c
+ smbd/smb1_negprot.c
'''
else:
SMB1_SOURCES = ''
@@ -624,7 +625,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
smbd/share_access.c
smbd/fileio.c
smbd/smb2_ipc.c
- smbd/negprot.c
smbd/nttrans.c
smbd/pipes.c
smbd/reply.c