From a00032a92d9c0fcd4fa3f551abb901e5240f780f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 27 Dec 2011 10:25:55 +1100 Subject: s3-libsmb Make auth_ntlmssp client more generic As well as renaming, this allows us to start the mech by DCE/RPC auth type or OID. Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/include/auth_generic.h | 48 ++++++++++++++++++++++++++++++++++++++++++ source3/include/ntlmssp_wrap.h | 44 -------------------------------------- 2 files changed, 48 insertions(+), 44 deletions(-) create mode 100644 source3/include/auth_generic.h delete mode 100644 source3/include/ntlmssp_wrap.h (limited to 'source3/include') diff --git a/source3/include/auth_generic.h b/source3/include/auth_generic.h new file mode 100644 index 0000000000..faea6106ad --- /dev/null +++ b/source3/include/auth_generic.h @@ -0,0 +1,48 @@ +/* + NLTMSSP wrappers + + Copyright (C) Andrew Tridgell 2001 + Copyright (C) Andrew Bartlett 2001-2011 + + 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 . +*/ + +#ifndef _AUTH_GENERIC_ +#define _AUTH_GENERIC_ + +struct gensec_security; + +struct auth_generic_state { + /* used only by the client implementation */ + struct cli_credentials *credentials; + + /* used by both */ + struct gensec_security *gensec_security; +}; + +NTSTATUS auth_generic_set_username(struct auth_generic_state *ans, + const char *user); +NTSTATUS auth_generic_set_domain(struct auth_generic_state *ans, + const char *domain); +NTSTATUS auth_generic_set_password(struct auth_generic_state *ans, + const char *password); +NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, + struct auth_generic_state **_ans); +NTSTATUS auth_generic_client_start(struct auth_generic_state *ans, const char *oid); + +NTSTATUS auth_generic_client_start_by_authtype(struct auth_generic_state *ans, + uint8_t auth_type, + uint8_t auth_level); + +#endif /* _AUTH_GENERIC_ */ diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h deleted file mode 100644 index ac2c77da37..0000000000 --- a/source3/include/ntlmssp_wrap.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - NLTMSSP wrappers - - Copyright (C) Andrew Tridgell 2001 - Copyright (C) Andrew Bartlett 2001-2003 - - 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 . -*/ - -#ifndef _NTLMSSP_WRAP_ -#define _NTLMSSP_WRAP_ - -struct gensec_security; - -struct auth_generic_state { - /* used only by the client implementation */ - struct cli_credentials *credentials; - - /* used by both */ - struct gensec_security *gensec_security; -}; - -NTSTATUS auth_ntlmssp_set_username(struct auth_generic_state *ans, - const char *user); -NTSTATUS auth_ntlmssp_set_domain(struct auth_generic_state *ans, - const char *domain); -NTSTATUS auth_ntlmssp_set_password(struct auth_generic_state *ans, - const char *password); -NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, - struct auth_generic_state **_ans); -NTSTATUS auth_ntlmssp_client_start(struct auth_generic_state *ans); - -#endif /* _NTLMSSP_WRAP_ */ -- cgit