r1796: Enable server-side SPNEGO, now that I have fixed the server-side SMB

signing code to be able to cope.

Andrew Bartlett
(This used to be commit cb74d52b563730a50e33c92d868c45ee96a598e8)

3 files changed, 38 insertions, 16 deletions

diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h
index a31bc35b9c..f289d5b546 100644
--- a/source4/include/cli_context.h
+++ b/source4/include/cli_context.h
@@ -29,22 +29,6 @@ struct smbcli_request;  /* forward declare */
 struct smbcli_session;  /* forward declare */
 struct smbcli_transport;  /* forward declare */
 
-enum smb_signing_engine_state {
-	SMB_SIGNING_ENGINE_OFF,
-	SMB_SIGNING_ENGINE_BSRSPYL,
-	SMB_SIGNING_ENGINE_ON
-};
-
-struct smb_signing_context {
-	enum smb_signing_engine_state signing_state;
-	DATA_BLOB mac_key;
-	uint32_t next_seq_num;
-	BOOL allow_smb_signing;
-	BOOL doing_signing;
-	BOOL mandatory_signing;
-	BOOL seen_valid; /* Have I ever seen a validly signed packet? */
-};
-
 /* context that will be and has been negotiated between the client and server */
 struct smbcli_negotiate {
 	/* 
diff --git a/source4/include/includes.h b/source4/include/includes.h
index e13175ecb7..f2900697f9 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -663,6 +663,7 @@ extern int errno;
 #include "smbd/service.h"
 #include "rpc_server/dcerpc_server.h"
 #include "request.h"
+#include "signing.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
diff --git a/source4/include/signing.h b/source4/include/signing.h
new file mode 100644
index 0000000000..c290f96788
--- /dev/null
+++ b/source4/include/signing.h
@@ -0,0 +1,37 @@
+/*
+   Unix SMB/CIFS implementation.
+   SMB Signing
+
+   Andrew Bartlett <abartlet@samba.org> 2003-2004
+
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+enum smb_signing_engine_state {
+	SMB_SIGNING_ENGINE_OFF,
+	SMB_SIGNING_ENGINE_BSRSPYL,
+	SMB_SIGNING_ENGINE_ON
+};
+
+struct smb_signing_context {
+	enum smb_signing_engine_state signing_state;
+	DATA_BLOB mac_key;
+	uint32_t next_seq_num;
+	BOOL allow_smb_signing;
+	BOOL doing_signing;
+	BOOL mandatory_signing;
+	BOOL seen_valid; /* Have I ever seen a validly signed packet? */
+};
+