From bb9014d5cbbc2ebb8fbd9fab05a3f3fc57e725b8 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 18 Feb 2010 14:10:26 -0500 Subject: schannel: merge header files One almost empty header file was simply including another not included by anything else. Just merge them together. --- libcli/auth/schannel_state.h | 38 ++++++++++++++++++++++++++++---- libcli/auth/schannel_state_proto.h | 44 -------------------------------------- 2 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 libcli/auth/schannel_state_proto.h diff --git a/libcli/auth/schannel_state.h b/libcli/auth/schannel_state.h index e60f4d9891..efa8d20b08 100644 --- a/libcli/auth/schannel_state.h +++ b/libcli/auth/schannel_state.h @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. module to store/fetch session keys for the schannel server @@ -10,16 +10,46 @@ 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 _LIBCLI_AUTH_SCHANNEL_STATE_H__ +#define _LIBCLI_AUTH_SCHANNEL_STATE_H__ + struct ldb_context; struct tdb_context; -#include "libcli/auth/schannel_state_proto.h" + +NTSTATUS schannel_store_session_key_ldb(struct ldb_context *ldb, + TALLOC_CTX *mem_ctx, + struct netlogon_creds_CredentialState *creds); +NTSTATUS schannel_fetch_session_key_ldb(struct ldb_context *ldb, + TALLOC_CTX *mem_ctx, + const char *computer_name, + struct netlogon_creds_CredentialState **creds); +NTSTATUS schannel_creds_server_step_check_ldb(struct ldb_context *ldb, + TALLOC_CTX *mem_ctx, + const char *computer_name, + struct netr_Authenticator *received_authenticator, + struct netr_Authenticator *return_authenticator, + struct netlogon_creds_CredentialState **creds_out); +NTSTATUS schannel_store_session_key_tdb(struct tdb_context *tdb, + TALLOC_CTX *mem_ctx, + struct netlogon_creds_CredentialState *creds); +NTSTATUS schannel_fetch_session_key_tdb(struct tdb_context *tdb, + TALLOC_CTX *mem_ctx, + const char *computer_name, + struct netlogon_creds_CredentialState **creds); +NTSTATUS schannel_creds_server_step_check_tdb(struct tdb_context *tdb, + TALLOC_CTX *mem_ctx, + const char *computer_name, + struct netr_Authenticator *received_authenticator, + struct netr_Authenticator *return_authenticator, + struct netlogon_creds_CredentialState **creds_out); +#endif diff --git a/libcli/auth/schannel_state_proto.h b/libcli/auth/schannel_state_proto.h deleted file mode 100644 index da5ebb3b7b..0000000000 --- a/libcli/auth/schannel_state_proto.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _LIBCLI_AUTH_SCHANNEL_STATE_PROTO_H__ -#define _LIBCLI_AUTH_SCHANNEL_STATE_PROTO_H__ - -#undef _PRINTF_ATTRIBUTE -#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) - -/* this file contains prototypes for functions that are private - * to this subsystem or library. These functions should not be - * used outside this particular subsystem! */ - - -/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/schannel_state.c */ - -NTSTATUS schannel_store_session_key_ldb(struct ldb_context *ldb, - TALLOC_CTX *mem_ctx, - struct netlogon_creds_CredentialState *creds); -NTSTATUS schannel_fetch_session_key_ldb(struct ldb_context *ldb, - TALLOC_CTX *mem_ctx, - const char *computer_name, - struct netlogon_creds_CredentialState **creds); -NTSTATUS schannel_creds_server_step_check_ldb(struct ldb_context *ldb, - TALLOC_CTX *mem_ctx, - const char *computer_name, - struct netr_Authenticator *received_authenticator, - struct netr_Authenticator *return_authenticator, - struct netlogon_creds_CredentialState **creds_out); -NTSTATUS schannel_store_session_key_tdb(struct tdb_context *tdb, - TALLOC_CTX *mem_ctx, - struct netlogon_creds_CredentialState *creds); -NTSTATUS schannel_fetch_session_key_tdb(struct tdb_context *tdb, - TALLOC_CTX *mem_ctx, - const char *computer_name, - struct netlogon_creds_CredentialState **creds); -NTSTATUS schannel_creds_server_step_check_tdb(struct tdb_context *tdb, - TALLOC_CTX *mem_ctx, - const char *computer_name, - struct netr_Authenticator *received_authenticator, - struct netr_Authenticator *return_authenticator, - struct netlogon_creds_CredentialState **creds_out); - -#undef _PRINTF_ATTRIBUTE -#define _PRINTF_ATTRIBUTE(a1, a2) - -#endif -- cgit