DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DFDD21019
Subject: Re: [PATCH] nfs-utils: Allow setting of commented out values in
 nfs.conf
To:     Justin Mitchell <jumitche@redhat.com>,
        Linux NFS Mailing list <linux-nfs@vger.kernel.org>
References: <1540480050.8177.2.camel@redhat.com>
From:   Steve Dickson <SteveD@RedHat.com>
Message-ID: <92dc60df-e956-5c85-08be-32fa1ad4efad@RedHat.com>
Date:   Thu, 29 Nov 2018 14:47:04 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.3.1
MIME-Version: 1.0
In-Reply-To: <1540480050.8177.2.camel@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk


On 10/25/18 11:07 AM, Justin Mitchell wrote:
> When using nfsconf tool to set values, allow it to uncomment a setting
> it finds in the relevant section if it would otherwise have had to create
> a new one.
> 
> Signed-off-by: Justin Mitchell <jumitche@redhat.com>
Committed... Sorry it too so long.... 

steved.

> ---
>  support/nfs/conffile.c | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
> index 3845b94..713f81b 100644
> --- a/support/nfs/conffile.c
> +++ b/support/nfs/conffile.c
> @@ -1830,6 +1830,8 @@ conf_write(const char *filename, const char *section, const char *arg,
>  
>  			/* this is the section we care about */
>  			if (where != NULL && is_section(where->text, section, arg)) {
> +				struct outbuffer *section_start = where;
> +
>  				/* is there an existing assignment */
>  				while ((where = TAILQ_NEXT(where, link)) != NULL) {
>  					if (is_tag(where->text, tag)) {
> @@ -1838,6 +1840,26 @@ conf_write(const char *filename, const char *section, const char *arg,
>  					}
>  				}
>  
> +				/* no active assignment, but is there a commented one */
> +				if (!found) {
> +					where = section_start;
> +					while ((where = TAILQ_NEXT(where, link)) != NULL) {
> +						if (is_comment(where->text)) {
> +							char *cline = where->text;
> +							while (isspace(*cline)) cline++;
> +
> +							if (*cline != '#') continue;
> +							cline++;
> +
> +							if (is_tag(cline, tag)) {
> +								found = true;
> +								break;
> +							}
> +						}
> +					}
> +				}
> +
> +				/* replace the located tag with an updated one */
>  				if (found) {
>  					struct outbuffer *prev = TAILQ_PREV(where, tailhead, link);
>  					bool again = false;
>