sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

param: Create and use enum_smb_encryption_vals

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2020-05-28 10:04:19 +02:00 committed by Andreas Schneider
parent bd5a888746
commit f03bb8ad8a
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-xml/smbdotconf/security/serversmbencrypt.xml
View File

@ -1,7 +1,7 @@
<samba:parameter name="server smb encrypt"
context="S"
type="enum"
enumlist="enum_smb_signing_vals"
enumlist="enum_smb_encryption_vals"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>

2
docs-xml/smbdotconf/security/smbencrypt.xml
View File

@ -1,7 +1,7 @@
<samba:parameter name="smb encrypt"
context="S"
type="enum"
enumlist="enum_smb_signing_vals"
enumlist="enum_smb_encryption_vals"
function="server_smb_encrypt"
synonym="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">

23
lib/param/param_table.c
View File

@ -138,6 +138,29 @@ static const struct enum_list enum_smb_signing_vals[] = {
{-1, NULL}
};
static const struct enum_list enum_smb_encryption_vals[] = {
{SMB_ENCRYPTION_DEFAULT, "default"},
{SMB_ENCRYPTION_OFF, "No"},
{SMB_ENCRYPTION_OFF, "False"},
{SMB_ENCRYPTION_OFF, "0"},
{SMB_ENCRYPTION_OFF, "Off"},
{SMB_ENCRYPTION_OFF, "disabled"},
{SMB_ENCRYPTION_IF_REQUIRED, "if_required"},
{SMB_ENCRYPTION_IF_REQUIRED, "Yes"},
{SMB_ENCRYPTION_IF_REQUIRED, "True"},
{SMB_ENCRYPTION_IF_REQUIRED, "1"},
{SMB_ENCRYPTION_IF_REQUIRED, "On"},
{SMB_ENCRYPTION_IF_REQUIRED, "enabled"},
{SMB_ENCRYPTION_IF_REQUIRED, "auto"},
{SMB_ENCRYPTION_DESIRED, "desired"},
{SMB_ENCRYPTION_REQUIRED, "required"},
{SMB_ENCRYPTION_REQUIRED, "mandatory"},
{SMB_ENCRYPTION_REQUIRED, "force"},
{SMB_ENCRYPTION_REQUIRED, "forced"},
{SMB_ENCRYPTION_REQUIRED, "enforced"},
{-1, NULL}
};
static const struct enum_list enum_mdns_name_values[] = {
{MDNS_NAME_NETBIOS, "netbios"},
{MDNS_NAME_MDNS, "mdns"},

9
libcli/smb/smb_constants.h
View File

@ -106,6 +106,15 @@ enum smb_signing_setting {
SMB_SIGNING_REQUIRED = 3,
};
/* This MUST align with 'enum smb_signing_setting' */
enum smb_encryption_setting {
SMB_ENCRYPTION_DEFAULT = SMB_SIGNING_DEFAULT,
SMB_ENCRYPTION_OFF = SMB_SIGNING_OFF,
SMB_ENCRYPTION_IF_REQUIRED = SMB_SIGNING_IF_REQUIRED,
SMB_ENCRYPTION_DESIRED = SMB_SIGNING_DESIRED,
SMB_ENCRYPTION_REQUIRED = SMB_SIGNING_REQUIRED,
};
/* types of buffers in core SMB protocol */
#define SMB_DATA_BLOCK 0x1
#define SMB_ASCII4 0x4