param: Create and use enum_smb_encryption_vals

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/docs-xml/smbdotconf/security/serversmbencrypt.xml b/docs-xml/smbdotconf/security/serversmbencrypt.xml
index 714aacbf1ca07691786f26522ff8eb86f7594b35..5f38b46419e0bc66ad9a5baa3b4373fb1e2a590b 100644 (file)
--- a/docs-xml/smbdotconf/security/serversmbencrypt.xml
+++ b/docs-xml/smbdotconf/security/serversmbencrypt.xml
@@ -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>

diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index 798e616b7651286ef309218082b7d47b95024ca5..60271200c0ac707940883c67a316a9e3fb3164ad 100644 (file)
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -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">

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 47b85de1f876528f36a67684d320bad099e12bf9..e2f737279dc8b88e8ec2d7e28866dc1db09eaa36 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -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"},

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index b424b13cde48609a02a77703469b970a11649c1f..2fb1fd7189efa914e68260ff8325175985b2eb17 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -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