From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chuck Lever Subject: [PATCH] mount.nfs: restore admin-specified clientaddr option Date: Thu, 30 Aug 2007 13:46:20 -0400 Message-ID: <20070830174620.3799.1497.stgit@monet.1015granger.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: nfs@lists.sourceforge.net To: neilb@suse.de Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1IQo6X-00054N-4g for nfs@lists.sourceforge.net; Thu, 30 Aug 2007 10:46:53 -0700 Received: from flpi102.sbcis.sbc.com ([207.115.20.71] helo=flpi102.prodigy.net) by mail.sourceforge.net with esmtp (Exim 4.44) id 1IQo6b-0005Ox-Ez for nfs@lists.sourceforge.net; Thu, 30 Aug 2007 10:46:57 -0700 List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net Revert an earlier change to make specifying the clientaddr= option illegal. Jeff Layton pointed out that admins may want to specify the clientaddr= option to advertise a different callback address when accessing an NFSv4 server through a NAT router. Signed-off-by: Chuck Lever --- utils/mount/stropts.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 12f6423..236a3b4 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -201,7 +201,9 @@ static int append_addr_opt(struct sockaddr_in *saddr, char **extra_opts) } /* - * Append the 'clientaddr=' option to the options string. + * Called if no 'clientaddr=' option was specified in the options string + * to discover our address and append an appropriate 'clientaddr=' option + * to the options string. * * Returns 1 if 'clientaddr=' option created successfully; * otherwise zero. @@ -319,15 +321,10 @@ int nfs4mount_s(const char *spec, const char *node, int flags, return EX_FAIL; } - if (ca_opt) { - nfs_error(_("%s: Illegal option: 'clientaddr='"), progname); - return EX_FAIL; - } - if (!append_addr_opt(&saddr, extra_opts)) return EX_FAIL; - if (!append_clientaddr_opt(&saddr, extra_opts)) + if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts)) return EX_FAIL; if (verbose) ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs