Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:27201 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751069Ab3DVRHF (ORCPT ); Mon, 22 Apr 2013 13:07:05 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3MH75la018062 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Apr 2013 13:07:05 -0400 Message-ID: <51756E38.6030905@RedHat.com> Date: Mon, 22 Apr 2013 13:07:04 -0400 From: Steve Dickson MIME-Version: 1.0 To: Jose Castillo CC: Linux NFS Mailing list Subject: Re: [PATCH] Add the missing '$' in auth_unix_ip() References: <1365522899-29123-1-git-send-email-jcastillo@redhat.com> In-Reply-To: <1365522899-29123-1-git-send-email-jcastillo@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-nfs-owner@vger.kernel.org List-ID: On 09/04/13 11:54, Jose Castillo wrote: > Signed-off-by: Jose Castillo Committed... steved. > --- > utils/mountd/cache.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c > index 978698d..e1027f3 100644 > --- a/utils/mountd/cache.c > +++ b/utils/mountd/cache.c > @@ -80,7 +80,7 @@ static void auth_unix_ip(FILE *f) > */ > char *cp; > char class[20]; > - char ipaddr[INET6_ADDRSTRLEN]; > + char ipaddr[INET6_ADDRSTRLEN + 1]; > char *client = NULL; > struct addrinfo *tmp = NULL; > if (readline(fileno(f), &lbuf, &lbuflen) != 1) > @@ -94,7 +94,7 @@ static void auth_unix_ip(FILE *f) > strcmp(class, "nfsd") != 0) > return; > > - if (qword_get(&cp, ipaddr, sizeof(ipaddr)) <= 0) > + if (qword_get(&cp, ipaddr, sizeof(ipaddr) - 1) <= 0) > return; > > tmp = host_pton(ipaddr); > @@ -116,9 +116,11 @@ static void auth_unix_ip(FILE *f) > qword_print(f, "nfsd"); > qword_print(f, ipaddr); > qword_printtimefrom(f, DEFAULT_TTL); > - if (use_ipaddr) > + if (use_ipaddr) { > + memmove(ipaddr + 1, ipaddr, strlen(ipaddr) + 1); > + ipaddr[0] = '$'; > qword_print(f, ipaddr); > - else if (client) > + } else if (client) > qword_print(f, *client?client:"DEFAULT"); > qword_eol(f); > xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT"); >