sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

smbd: Move smb2_srv_init_signing to smb2_signing.c

Browse Source 
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
David Mulder 2022-03-17 13:55:25 -06:00 committed by Jeremy Allison
parent cafa8260ad
commit 047df61561
4 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/proto.h
View File

@ -66,6 +66,10 @@ void smb1_srv_set_signing(struct smbXsrv_connection *conn,
const DATA_BLOB user_session_key,
const DATA_BLOB response);
/* The following definitions come from smbd/smb2_signing.c */
bool smb2_srv_init_signing(struct smbXsrv_connection *conn);
/* The following definitions come from smbd/aio.c */
struct aio_extra;

17
source3/smbd/signing.c
View File

@ -232,23 +232,6 @@ static bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
return true;
}
static bool smb2_srv_init_signing(struct smbXsrv_connection *conn)
{
struct loadparm_context *lp_ctx = loadparm_init_s3(conn, loadparm_s3_helpers());
if (lp_ctx == NULL) {
DBG_DEBUG("loadparm_init_s3 failed\n");
return false;
}
/*
* For SMB2 all we need to know is if signing is mandatory.
* It is always allowed and desired, whatever the smb.conf says.
*/
(void)lpcfg_server_signing_allowed(lp_ctx, &conn->smb2.signing_mandatory);
talloc_unlink(conn, lp_ctx);
return true;
}
bool srv_init_signing(struct smbXsrv_connection *conn)
{
if (conn->protocol >= PROTOCOL_SMB2_02) {

44
source3/smbd/smb2_signing.c Normal file
View File

@ -0,0 +1,44 @@
/*
Unix SMB/CIFS implementation.
SMB Signing Code
Copyright (C) Jeremy Allison 2003.
Copyright (C) Andrew Bartlett <abartlet@samba.org> 2002-2003
Copyright (C) Stefan Metzmacher 2009
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 <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "../libcli/smb/smb_signing.h"
#include "lib/param/param.h"
#include "smb2_signing.h"
bool smb2_srv_init_signing(struct smbXsrv_connection *conn)
{
struct loadparm_context *lp_ctx = loadparm_init_s3(conn, loadparm_s3_helpers());
if (lp_ctx == NULL) {
DBG_DEBUG("loadparm_init_s3 failed\n");
return false;
}
/*
* For SMB2 all we need to know is if signing is mandatory.
* It is always allowed and desired, whatever the smb.conf says.
*/
(void)lpcfg_server_signing_allowed(lp_ctx, &conn->smb2.signing_mandatory);
talloc_unlink(conn, lp_ctx);
return true;
}

1
source3/wscript_build
View File

@ -664,6 +664,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
smbd/smb2_aio.c smbd/statvfs.c
smbd/dmapi.c
smbd/signing.c
smbd/smb2_signing.c
smbd/file_access.c
smbd/dnsregister.c smbd/globals.c
smbd/smb2_server.c