summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-12-26 14:57:02 +1100
committerStefan Metzmacher <metze@samba.org>2012-01-05 17:17:28 +0100
commit16e463e16900822d29fa57dd210cff2be5933402 (patch)
tree00f154b084f2a8c9559d6a174ee4b6f836c8f18c
parent3042e38d519411e774e110b16a2eeeaef4b25a65 (diff)
downloadsamba-16e463e16900822d29fa57dd210cff2be5933402.tar.gz
samba-16e463e16900822d29fa57dd210cff2be5933402.tar.bz2
samba-16e463e16900822d29fa57dd210cff2be5933402.zip
s3-auth Remove ntlmssp_wrap.h which is no longer required
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/auth/auth_generic.c1
-rw-r--r--source3/auth/auth_ntlmssp.c1
-rw-r--r--source3/include/auth.h2
-rw-r--r--source3/include/ntlmssp_wrap.h2
-rw-r--r--source3/rpc_server/dcesrv_auth_generic.c1
-rw-r--r--source3/smbd/negprot.c1
-rw-r--r--source3/smbd/seal.c1
-rw-r--r--source3/smbd/sesssetup.c1
-rw-r--r--source3/smbd/smb2_sesssetup.c1
9 files changed, 1 insertions, 10 deletions
diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index cd4b764e85..03e3463803 100644
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "auth.h"
#include "../auth/ntlmssp/ntlmssp.h"
-#include "ntlmssp_wrap.h"
#include "../librpc/gen_ndr/netlogon.h"
#include "../librpc/gen_ndr/dcerpc.h"
#include "../lib/tsocket/tsocket.h"
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index f2b7fa4a19..7a23a927ef 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "auth.h"
#include "../auth/ntlmssp/ntlmssp.h"
-#include "ntlmssp_wrap.h"
#include "../librpc/gen_ndr/netlogon.h"
#include "../librpc/gen_ndr/dcerpc.h"
#include "../lib/tsocket/tsocket.h"
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 522dc59a37..dd70059290 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -128,7 +128,7 @@ struct auth_init_function_entry {
struct auth_init_function_entry *prev, *next;
};
-struct gensec_security;
+extern const struct gensec_security_ops gensec_ntlmssp3_server_ops;
/* Changed from 1 -> 2 to add the logon_parameters field. */
/* Changed from 2 -> 3 when we reworked many auth structures to use IDL or be in common with Samba4 */
diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h
index 07f474f103..ac2c77da37 100644
--- a/source3/include/ntlmssp_wrap.h
+++ b/source3/include/ntlmssp_wrap.h
@@ -23,8 +23,6 @@
struct gensec_security;
-extern const struct gensec_security_ops gensec_ntlmssp3_server_ops;
-
struct auth_generic_state {
/* used only by the client implementation */
struct cli_credentials *credentials;
diff --git a/source3/rpc_server/dcesrv_auth_generic.c b/source3/rpc_server/dcesrv_auth_generic.c
index 78d0d78ffa..5fe676627a 100644
--- a/source3/rpc_server/dcesrv_auth_generic.c
+++ b/source3/rpc_server/dcesrv_auth_generic.c
@@ -21,7 +21,6 @@
#include "includes.h"
#include "rpc_server/dcesrv_auth_generic.h"
-#include "ntlmssp_wrap.h"
#include "auth.h"
#include "auth/gensec/gensec.h"
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 66da049bda..473b98a8a2 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -24,7 +24,6 @@
#include "../libcli/auth/spnego.h"
#include "serverid.h"
#include "auth.h"
-#include "ntlmssp_wrap.h"
#include "messages.h"
#include "smbprofile.h"
#include "auth/gensec/gensec.h"
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 4393c1b27c..4c0ca82e47 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -22,7 +22,6 @@
#include "smbd/globals.h"
#include "../libcli/auth/spnego.h"
#include "../auth/ntlmssp/ntlmssp.h"
-#include "ntlmssp_wrap.h"
#include "../libcli/smb/smb_seal.h"
#include "../lib/util/asn1.h"
#include "auth.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index f1672ab1ad..08a3c2c238 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -28,7 +28,6 @@
#include "smbd/globals.h"
#include "../libcli/auth/spnego.h"
#include "../auth/ntlmssp/ntlmssp.h"
-#include "ntlmssp_wrap.h"
#include "../librpc/gen_ndr/krb5pac.h"
#include "libads/kerberos_proto.h"
#include "../lib/util/asn1.h"
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 3878b76820..017319ea7f 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -26,7 +26,6 @@
#include "../libcli/auth/spnego.h"
#include "../auth/gensec/gensec.h"
#include "../auth/ntlmssp/ntlmssp.h"
-#include "ntlmssp_wrap.h"
#include "../librpc/gen_ndr/krb5pac.h"
#include "libads/kerberos_proto.h"
#include "../lib/util/asn1.h"