[PATCHES] Small cleanup for nfs4_acls.c

[Ralph Boehme]

Hi Christof,

all reviewed-by: me.

-Ralph

On Sun, Aug 23, 2015 at 11:37:37AM -0700, Christof Schmitt wrote:
> From 738382c4f25d619af00be052cad911a52b8a130d Mon Sep 17 00:00:00 2001
> From: Christof Schmitt <cs at samba.org>
> Date: Thu, 13 Aug 2015 11:03:48 -0700
> Subject: [PATCH 1/3] nfs4_acl: Remove unused includes
> 
> Signed-off-by: Christof Schmitt <cs at samba.org>
> ---
>  source3/modules/nfs4_acls.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
> index 26a98b7..8948814 100644
> --- a/source3/modules/nfs4_acls.c
> +++ b/source3/modules/nfs4_acls.c
> @@ -23,11 +23,7 @@
>  #include "librpc/gen_ndr/ndr_security.h"
>  #include "../libcli/security/dom_sid.h"
>  #include "../libcli/security/security.h"
> -#include "dbwrap/dbwrap.h"
> -#include "dbwrap/dbwrap_open.h"
>  #include "system/filesys.h"
> -#include "passdb/lookup_sid.h"
> -#include "util_tdb.h"
>  #include "lib/param/loadparm.h"
>  
>  #undef DBGC_CLASS
> -- 
> 1.7.1
> 
> 
> From 28bffa2ab8d628038e5bf9c7ab5445de59d5b3a0 Mon Sep 17 00:00:00 2001
> From: Christof Schmitt <cs at samba.org>
> Date: Thu, 13 Aug 2015 11:09:03 -0700
> Subject: [PATCH 2/3] nfs4acl: Print unknown config settings as a warning
> 
> While touching the messages, also remove the use of the unneeded define
> for "nfs4".
> 
> Signed-off-by: Christof Schmitt <cs at samba.org>
> ---
>  source3/modules/nfs4_acls.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
> index 8948814..55f4ab8 100644
> --- a/source3/modules/nfs4_acls.c
> +++ b/source3/modules/nfs4_acls.c
> @@ -84,8 +84,7 @@ static int smbacl4_get_vfs_params(
>  	enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "mode",
>  			       enum_smbacl4_modes, e_simple);
>  	if (enumval == -1) {
> -		DEBUG(10, ("value for %s:mode unknown\n",
> -			   SMBACL4_PARAM_TYPE_NAME));
> +		DBG_WARNING("value for nfs4:mode unknown\n");
>  		return -1;
>  	}
>  	params->mode = (enum smbacl4_mode_enum)enumval;
> @@ -96,8 +95,7 @@ static int smbacl4_get_vfs_params(
>  	enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "acedup",
>  			       enum_smbacl4_acedups, e_dontcare);
>  	if (enumval == -1) {
> -		DEBUG(10, ("value for %s:acedup unknown\n",
> -			   SMBACL4_PARAM_TYPE_NAME));
> +		DBG_WARNING("value for nfs4:acedup unknown\n");
>  		return -1;
>  	}
>  	params->acedup = (enum smbacl4_acedup_enum)enumval;
> -- 
> 1.7.1
> 
> 
> From 07f334c39cd75a0042638b90a354e0fd66f62949 Mon Sep 17 00:00:00 2001
> From: Christof Schmitt <cs at samba.org>
> Date: Thu, 13 Aug 2015 11:10:42 -0700
> Subject: [PATCH 3/3] nfs4acl: Remove SMBACL4_PARAM_TYPE_NAME
> 
> Use "nfs4" instead, which is easier to read in the code.
> 
> Signed-off-by: Christof Schmitt <cs at samba.org>
> ---
>  source3/modules/nfs4_acls.c |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
> index 55f4ab8..a193d98 100644
> --- a/source3/modules/nfs4_acls.c
> +++ b/source3/modules/nfs4_acls.c
> @@ -29,8 +29,6 @@
>  #undef DBGC_CLASS
>  #define DBGC_CLASS DBGC_ACLS
>  
> -#define SMBACL4_PARAM_TYPE_NAME "nfs4"
> -
>  extern const struct generic_mapping file_generic_mapping;
>  
>  struct SMB4ACE_T
> @@ -81,7 +79,7 @@ static int smbacl4_get_vfs_params(
>  
>  	ZERO_STRUCTP(params);
>  
> -	enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "mode",
> +	enumval = lp_parm_enum(SNUM(conn), "nfs4", "mode",
>  			       enum_smbacl4_modes, e_simple);
>  	if (enumval == -1) {
>  		DBG_WARNING("value for nfs4:mode unknown\n");
> @@ -89,10 +87,9 @@ static int smbacl4_get_vfs_params(
>  	}
>  	params->mode = (enum smbacl4_mode_enum)enumval;
>  
> -	params->do_chown = lp_parm_bool(SNUM(conn), SMBACL4_PARAM_TYPE_NAME,
> -		"chown", true);
> +	params->do_chown = lp_parm_bool(SNUM(conn), "nfs4", "chown", true);
>  
> -	enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "acedup",
> +	enumval = lp_parm_enum(SNUM(conn), "nfs4", "acedup",
>  			       enum_smbacl4_acedups, e_dontcare);
>  	if (enumval == -1) {
>  		DBG_WARNING("value for nfs4:acedup unknown\n");
> -- 
> 1.7.1
> 

-- 
Schönen Gruß
Ralph Böhme

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de,mailto:kontakt@sernet.de