The branch, master has been updated via 43e198c188367bfe747ea52ae74679ac8bbc41dc (commit) from 503d0358140fbf56bd83090f143272aeb770baa9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 43e198c188367bfe747ea52ae74679ac8bbc41dc Author: Günther Deschner <g...@samba.org> Date: Thu Sep 17 01:39:12 2009 +0200 spnego: add spnego_proto.h. Guenther ----------------------------------------------------------------------- Summary of changes: libcli/auth/spnego.h | 2 +- libcli/{smb/smb_common.h => auth/spnego_proto.h} | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) copy libcli/{smb/smb_common.h => auth/spnego_proto.h} (60%) Changeset truncated at 500 lines: diff --git a/libcli/auth/spnego.h b/libcli/auth/spnego.h index 250ffed..08350a4 100644 --- a/libcli/auth/spnego.h +++ b/libcli/auth/spnego.h @@ -67,4 +67,4 @@ enum spnego_message_type { SPNEGO_NEG_TOKEN_TARG = 1, }; -#include "auth/gensec/spnego_proto.h" +#include "../libcli/auth/spnego_proto.h" diff --git a/libcli/smb/smb_common.h b/libcli/auth/spnego_proto.h similarity index 60% copy from libcli/smb/smb_common.h copy to libcli/auth/spnego_proto.h index d6186ab..5fd5e59 100644 --- a/libcli/smb/smb_common.h +++ b/libcli/auth/spnego_proto.h @@ -1,9 +1,9 @@ /* Unix SMB/CIFS implementation. - SMB and SMB2 common header + RFC2478 Compliant SPNEGO implementation - Copyright (C) Stefan Metzmacher 2009 + Copyright (C) Jim McDonough <j...@us.ibm.com> 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 @@ -15,14 +15,14 @@ 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/>. */ -#ifndef __LIBCLI_SMB_SMB_COMMON_H__ -#define __LIBCLI_SMB_SMB_COMMON_H__ - -#include "../libcli/smb/smb2_constants.h" -#include "../libcli/smb/smb2_create_blob.h" - -#endif +ssize_t spnego_read_data(TALLOC_CTX *mem_ctx, DATA_BLOB data, struct spnego_data *token); +ssize_t spnego_write_data(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct spnego_data *spnego); +bool spnego_free_data(struct spnego_data *spnego); +bool spnego_write_mech_types(TALLOC_CTX *mem_ctx, + const char **mech_types, + DATA_BLOB *blob); -- Samba Shared Repository