2016-01-28 22:39:40

by Malahal Naineni

[permalink] [raw]
Subject: [PATCH] Ignore whitespace at the beginning of option tags

The following should work now:

[General]
Domain = local.domain.edu

Signed-off-by: Malahal Naineni <[email protected]>
---
cfg.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cfg.c b/cfg.c
index c615d24..e0ab839 100644
--- a/cfg.c
+++ b/cfg.c
@@ -210,6 +210,7 @@ static void
conf_parse_line (int trans, char *line, size_t sz)
{
char *val;
+ char *tag;
size_t i;
int j;
static char *section = 0;
@@ -262,8 +263,14 @@ conf_parse_line (int trans, char *line, size_t sz)
/* Skip trailing whitespace, if any */
for (j = sz - (val - line) - 1; j > 0 && isspace (val[j]); j--)
val[j] = '\0';
+
+ /* Skip beginning white space */
+ tag = line;
+ while (isspace(*tag))
+ tag++;
+
/* XXX Perhaps should we not ignore errors? */
- conf_set (trans, section, line, val, 0, 0);
+ conf_set (trans, section, tag, val, 0, 0);
return;
}

--
1.8.3.1



2016-02-02 15:24:53

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH] Ignore whitespace at the beginning of option tags



On 01/28/2016 05:38 PM, Malahal Naineni wrote:
> The following should work now:
>
> [General]
> Domain = local.domain.edu
>
> Signed-off-by: Malahal Naineni <[email protected]>
> ---
> cfg.c | 9 ++++++++-
Ok.. I give... :-) What is this patch relative to? There is
a conf_parse_line() in support/nfs/conffile.c but there
is no cfg.c file in nfs-utils... and this patch does
not apply...

steved.

> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/cfg.c b/cfg.c
> index c615d24..e0ab839 100644
> --- a/cfg.c
> +++ b/cfg.c
> @@ -210,6 +210,7 @@ static void
> conf_parse_line (int trans, char *line, size_t sz)
> {
> char *val;
> + char *tag;
> size_t i;
> int j;
> static char *section = 0;
> @@ -262,8 +263,14 @@ conf_parse_line (int trans, char *line, size_t sz)
> /* Skip trailing whitespace, if any */
> for (j = sz - (val - line) - 1; j > 0 && isspace (val[j]); j--)
> val[j] = '\0';
> +
> + /* Skip beginning white space */
> + tag = line;
> + while (isspace(*tag))
> + tag++;
> +
> /* XXX Perhaps should we not ignore errors? */
> - conf_set (trans, section, line, val, 0, 0);
> + conf_set (trans, section, tag, val, 0, 0);
> return;
> }
>
>

2016-02-03 11:58:47

by Benjamin Coddington

[permalink] [raw]
Subject: Re: [PATCH] Ignore whitespace at the beginning of option tags

On Tue, 2 Feb 2016, Steve Dickson wrote:
>
> On 01/28/2016 05:38 PM, Malahal Naineni wrote:
> > The following should work now:
> >
> > [General]
> > Domain = local.domain.edu
> >
> > Signed-off-by: Malahal Naineni <[email protected]>
> > ---
> > cfg.c | 9 ++++++++-
> Ok.. I give... :-) What is this patch relative to? There is
> a conf_parse_line() in support/nfs/conffile.c but there
> is no cfg.c file in nfs-utils... and this patch does
> not apply...

This is for libnfsidap.. cc-ing Bruce.

Ben

> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/cfg.c b/cfg.c
> > index c615d24..e0ab839 100644
> > --- a/cfg.c
> > +++ b/cfg.c
> > @@ -210,6 +210,7 @@ static void
> > conf_parse_line (int trans, char *line, size_t sz)
> > {
> > char *val;
> > + char *tag;
> > size_t i;
> > int j;
> > static char *section = 0;
> > @@ -262,8 +263,14 @@ conf_parse_line (int trans, char *line, size_t sz)
> > /* Skip trailing whitespace, if any */
> > for (j = sz - (val - line) - 1; j > 0 && isspace (val[j]); j--)
> > val[j] = '\0';
> > +
> > + /* Skip beginning white space */
> > + tag = line;
> > + while (isspace(*tag))
> > + tag++;
> > +
> > /* XXX Perhaps should we not ignore errors? */
> > - conf_set (trans, section, line, val, 0, 0);
> > + conf_set (trans, section, tag, val, 0, 0);
> > return;
> > }
> >
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

2016-02-04 23:29:56

by Malahal Naineni

[permalink] [raw]
Subject: Re: [PATCH] Ignore whitespace at the beginning of option tags

Sorry Steve, Ben is right. It is based on
"git://git.linux-nfs.org/projects/steved/libnfsidmap.git"

Do I need to re-clone my repo with something else?

Regards, Malahal.

Benjamin Coddington [[email protected]] wrote:
> On Tue, 2 Feb 2016, Steve Dickson wrote:
> >
> > On 01/28/2016 05:38 PM, Malahal Naineni wrote:
> > > The following should work now:
> > >
> > > [General]
> > > Domain = local.domain.edu
> > >
> > > Signed-off-by: Malahal Naineni <[email protected]>
> > > ---
> > > cfg.c | 9 ++++++++-
> > Ok.. I give... :-) What is this patch relative to? There is
> > a conf_parse_line() in support/nfs/conffile.c but there
> > is no cfg.c file in nfs-utils... and this patch does
> > not apply...
>
> This is for libnfsidap.. cc-ing Bruce.
>
> Ben
>
> > > 1 file changed, 8 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/cfg.c b/cfg.c
> > > index c615d24..e0ab839 100644
> > > --- a/cfg.c
> > > +++ b/cfg.c
> > > @@ -210,6 +210,7 @@ static void
> > > conf_parse_line (int trans, char *line, size_t sz)
> > > {
> > > char *val;
> > > + char *tag;
> > > size_t i;
> > > int j;
> > > static char *section = 0;
> > > @@ -262,8 +263,14 @@ conf_parse_line (int trans, char *line, size_t sz)
> > > /* Skip trailing whitespace, if any */
> > > for (j = sz - (val - line) - 1; j > 0 && isspace (val[j]); j--)
> > > val[j] = '\0';
> > > +
> > > + /* Skip beginning white space */
> > > + tag = line;
> > > + while (isspace(*tag))
> > > + tag++;
> > > +
> > > /* XXX Perhaps should we not ignore errors? */
> > > - conf_set (trans, section, line, val, 0, 0);
> > > + conf_set (trans, section, tag, val, 0, 0);
> > > return;
> > > }
> > >
> > >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

2016-02-09 16:00:52

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH] Ignore whitespace at the beginning of option tags



On 02/04/2016 06:29 PM, Malahal Naineni wrote:
> Sorry Steve, Ben is right. It is based on
> "git://git.linux-nfs.org/projects/steved/libnfsidmap.git"
>
> Do I need to re-clone my repo with something else?
No... You are good... Committed!

I'm thinking we should probably roll libnfsidmap into
nfs-utils as a .a lib... The only binary using it,
to my knowledge, is rpc.idmapd and I don't think
we really want anybody else using it...

Thoughts?

steved.


>
> Regards, Malahal.
>
> Benjamin Coddington [[email protected]] wrote:
>> On Tue, 2 Feb 2016, Steve Dickson wrote:
>>>
>>> On 01/28/2016 05:38 PM, Malahal Naineni wrote:
>>>> The following should work now:
>>>>
>>>> [General]
>>>> Domain = local.domain.edu
>>>>
>>>> Signed-off-by: Malahal Naineni <[email protected]>
>>>> ---
>>>> cfg.c | 9 ++++++++-
>>> Ok.. I give... :-) What is this patch relative to? There is
>>> a conf_parse_line() in support/nfs/conffile.c but there
>>> is no cfg.c file in nfs-utils... and this patch does
>>> not apply...
>>
>> This is for libnfsidap.. cc-ing Bruce.
>>
>> Ben
>>
>>>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/cfg.c b/cfg.c
>>>> index c615d24..e0ab839 100644
>>>> --- a/cfg.c
>>>> +++ b/cfg.c
>>>> @@ -210,6 +210,7 @@ static void
>>>> conf_parse_line (int trans, char *line, size_t sz)
>>>> {
>>>> char *val;
>>>> + char *tag;
>>>> size_t i;
>>>> int j;
>>>> static char *section = 0;
>>>> @@ -262,8 +263,14 @@ conf_parse_line (int trans, char *line, size_t sz)
>>>> /* Skip trailing whitespace, if any */
>>>> for (j = sz - (val - line) - 1; j > 0 && isspace (val[j]); j--)
>>>> val[j] = '\0';
>>>> +
>>>> + /* Skip beginning white space */
>>>> + tag = line;
>>>> + while (isspace(*tag))
>>>> + tag++;
>>>> +
>>>> /* XXX Perhaps should we not ignore errors? */
>>>> - conf_set (trans, section, line, val, 0, 0);
>>>> + conf_set (trans, section, tag, val, 0, 0);
>>>> return;
>>>> }
>>>>
>>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>>> the body of a message to [email protected]
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>

2016-02-09 16:13:23

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH] Ignore whitespace at the beginning of option tags

On Tue, Feb 09, 2016 at 11:00:50AM -0500, Steve Dickson wrote:
>
>
> On 02/04/2016 06:29 PM, Malahal Naineni wrote:
> > Sorry Steve, Ben is right. It is based on
> > "git://git.linux-nfs.org/projects/steved/libnfsidmap.git"
> >
> > Do I need to re-clone my repo with something else?
> No... You are good... Committed!
>
> I'm thinking we should probably roll libnfsidmap into
> nfs-utils as a .a lib... The only binary using it,
> to my knowledge, is rpc.idmapd and I don't think
> we really want anybody else using it...
>
> Thoughts?

Fine by me.

The original motivation was to support POSIX<->NFSv4 ACL mapping in
libacl. That never went anywhere, so I think we can forget about it.

Sorry for being unresponsive here. I'm happy about anything that takes
libnfsidmap off my hands....

--b.

2016-02-11 18:02:49

by Malahal Naineni

[permalink] [raw]
Subject: Re: [PATCH] Ignore whitespace at the beginning of option tags

Steve Dickson [[email protected]] wrote:
>
>
> On 02/04/2016 06:29 PM, Malahal Naineni wrote:
> > Sorry Steve, Ben is right. It is based on
> > "git://git.linux-nfs.org/projects/steved/libnfsidmap.git"
> >
> > Do I need to re-clone my repo with something else?
> No... You are good... Committed!
>
> I'm thinking we should probably roll libnfsidmap into
> nfs-utils as a .a lib... The only binary using it,
> to my knowledge, is rpc.idmapd and I don't think
> we really want anybody else using it...
>
> Thoughts?

libnfsidmap.so is used by nfs-ganesha project where I found the issue,
so please keep it as DSO. I don't mind folding the code into nfs-utils
project though. nfs-ganesha does need nfs-utils rpms, so nfs-ganesha
should be good as long as it is a DSO.

Regards, Malahal.