diff mbox

[2/3] mountd: Deprecate the ability to disable TCP listeners.

Message ID 1382429966-14531-3-git-send-email-steved@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve Dickson Oct. 22, 2013, 8:19 a.m. UTC
Disable the ability to turn off TCP listeners since that
is the protocol now required and best suited for
NFS traffic.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/mountd/mountd.c   | 7 +++++--
 utils/mountd/mountd.man | 3 ---
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Jim Rees Oct. 22, 2013, 11:39 a.m. UTC | #1
Steve Dickson wrote:

  -"	[-N version|--no-nfs-version version] [-n|--no-tcp]\n"
  +"	[-N version|--no-nfs-version version] [-n|--no-tcp(deprecate)]\n"

I would take this out.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve Dickson Oct. 23, 2013, 1:59 p.m. UTC | #2
On 22/10/13 07:39, Jim Rees wrote:
> Steve Dickson wrote:
> 
>   -"	[-N version|--no-nfs-version version] [-n|--no-tcp]\n"
>   +"	[-N version|--no-nfs-version version] [-n|--no-tcp(deprecate)]\n"
> 
> I would take this out.
> 
Take out the word "deprecate" or the "[-n|--no-tcp(deprecate)]" flag?

steved.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jim Rees Oct. 23, 2013, 2:42 p.m. UTC | #3
Steve Dickson wrote:

  On 22/10/13 07:39, Jim Rees wrote:
  > Steve Dickson wrote:
  > 
  >   -"	[-N version|--no-nfs-version version] [-n|--no-tcp]\n"
  >   +"	[-N version|--no-nfs-version version] [-n|--no-tcp(deprecate)]\n"
  > 
  > I would take this out.
  > 
  Take out the word "deprecate" or the "[-n|--no-tcp(deprecate)]" flag?

Like this:

"	[-N version|--no-nfs-version version]\n"
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index f918472..46ff05f 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -755,7 +755,10 @@  main(int argc, char **argv)
 			nfs_version &= ~NFSVERSBIT(vers);
 			break;
 		case 'n':
-			NFSCTL_TCPUNSET(_rpcprotobits);
+			fprintf(stderr, 
+				"Deprecated: The -n flag (the ability to disable TCP listeners)" \
+				" is no longer supported\n");
+			usage(progname, 1);
 			break;
 		case 'r':
 			reverse_resolve = 1;
@@ -905,7 +908,7 @@  usage(const char *prog, int n)
 "Usage: %s [-F|--foreground] [-h|--help] [-v|--version] [-d kind|--debug kind]\n"
 "	[-o num|--descriptors num] [-f exports-file|--exports-file=file]\n"
 "	[-p|--port port] [-V version|--nfs-version version]\n"
-"	[-N version|--no-nfs-version version] [-n|--no-tcp]\n"
+"	[-N version|--no-nfs-version version] [-n|--no-tcp(deprecate)]\n"
 "	[-H ha-callout-prog] [-s|--state-directory-path path]\n"
 "	[-g|--manage-gids] [-t num|--num-threads=num]\n", prog);
 	exit(n);
diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man
index b60dc90..c049e35 100644
--- a/utils/mountd/mountd.man
+++ b/utils/mountd/mountd.man
@@ -112,9 +112,6 @@  either one of these version should not be offered,
 must be invoked with the option
 .B "\-\-no-nfs-version <vers>" .
 .TP
-.B \-n " or " \-\-no-tcp
-Don't advertise TCP for mount.
-.TP
 .B \-P
 Ignored (compatibility with unfsd??).
 .TP