[PATCH] Encryption is a SMB3 feature and not tied to UNIX extensions

[Michael Adam]

On 2015-12-21 at 09:35 +0100, Ralph Boehme wrote:
> Hi!
> 
> Encryption is a SMB3 feature and not tied to UNIX extensions.
> 
> Please review&push if ok.

Looks good except for one comment inline below:


> From 80a5d6057d77daa02433846b3540b77eb9ed1bbd Mon Sep 17 00:00:00 2001
> From: Ralph Boehme <slow at samba.org>
> Date: Mon, 2 Nov 2015 16:33:34 +0100
> Subject: [PATCH] s3: fix encryption help messages
> 
> Encryption is a SMB3 feature and not tied to UNIX extensions, so fix the
> help messages of various utilities.
> 
> Signed-off-by: Ralph Boehme <slow at samba.org>
> ---
>  source3/lib/popt_common.c | 2 +-
>  source3/locale/net/de.po  | 4 ++--
>  source3/utils/net.c       | 2 +-
>  source3/utils/smbget.c    | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
> index c2a95d7..b685b65 100644
> --- a/source3/lib/popt_common.c
> +++ b/source3/lib/popt_common.c
> @@ -508,7 +508,7 @@ struct poptOption popt_common_credentials[] = {
>  	{ "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" },
>  	{ "signing", 'S', POPT_ARG_STRING, NULL, 'S', "Set the client signing state", "on|off|required" },
>  	{"machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password" },
> -	{"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" },
> +	{"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport" },
>  	{"use-ccache", 'C', POPT_ARG_NONE, NULL, 'C',
>  	 "Use the winbind ccache for authentication" },
>  	{"pw-nt-hash", '\0', POPT_ARG_NONE, NULL, 'H',
> diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
> index 4b40ef0..4f9f0f7 100644
> --- a/source3/locale/net/de.po
> +++ b/source3/locale/net/de.po
> @@ -495,7 +495,7 @@ msgid "  Use 'net help help' to list usage information for 'net' commands."
>  msgstr ""
>  
>  #: ../../utils/net.c:759
> -msgid "Encrypt SMB transport (UNIX extended servers only)"
> +msgid "Encrypt SMB transport"
>  msgstr "SMB Übertragung verschlüsseln (nur UNIX erweiterte Server)"
>  
>  #: ../../utils/net.c:827
> @@ -3061,7 +3061,7 @@ msgid "\t-P or --machine-pass\t\tAuthenticate as machine account\n"
>  msgstr "\t-P oder --machine-pass\t\tMit Rechnerkonto authentifizieren\n"
>  
>  #: ../../utils/net_help_common.c:52
> -msgid "\t-e or --encrypt\t\t\tEncrypt SMB transport (UNIX extended servers only)\n"
> +msgid "\t-e or --encrypt\t\t\tEncrypt SMB transport\n"
>  msgstr "\t-e oder --encrypt\t\t\tSMB Übertragung verschlüsseln  (nur UNIX erweiterte Server)\n"

^^^
Shouldn't we adapt poor old German message, too? :-)

Cheers - Michael


>  #: ../../utils/net_help_common.c:54
> diff --git a/source3/utils/net.c b/source3/utils/net.c
> index 8182323..c0b21d5 100644
> --- a/source3/utils/net.c
> +++ b/source3/utils/net.c
> @@ -795,7 +795,7 @@ static struct functable net_func[] = {
>  		{"port",	'p', POPT_ARG_INT,    &c->opt_port},
>  		{"myname",	'n', POPT_ARG_STRING, &c->opt_requester_name},
>  		{"server",	'S', POPT_ARG_STRING, &c->opt_host},
> -		{"encrypt",	'e', POPT_ARG_NONE,   NULL, 'e', N_("Encrypt SMB transport (UNIX extended servers only)") },
> +		{"encrypt",	'e', POPT_ARG_NONE,   NULL, 'e', N_("Encrypt SMB transport") },
>  		{"container",	'c', POPT_ARG_STRING, &c->opt_container},
>  		{"comment",	'C', POPT_ARG_STRING, &c->opt_comment},
>  		{"maxusers",	'M', POPT_ARG_INT,    &c->opt_maxusers},
> diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
> index c3eb471..b3ce743 100644
> --- a/source3/utils/smbget.c
> +++ b/source3/utils/smbget.c
> @@ -597,7 +597,7 @@ int main(int argc, const char **argv)
>  	int ret = 0;
>  	struct poptOption long_options[] = {
>  		{"guest", 'a', POPT_ARG_NONE, NULL, 'a', "Work as user guest" },	
> -		{"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" },	
> +		{"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport" },
>  		{"resume", 'r', POPT_ARG_NONE, &resume, 0, "Automatically resume aborted files" },
>  		{"update", 'U',  POPT_ARG_NONE, &update, 0, "Download only when remote file is newer than local file or local file is missing"},
>  		{"recursive", 'R',  POPT_ARG_NONE, &recursive, 0, "Recursively download files" },
> -- 
> 2.1.4
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20151221/112885fe/signature.sig>