diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | support/nfs/rpcmisc.c | 4 | ||||
| -rw-r--r-- | utils/mountd/mountd.c | 2 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,16 @@ +2003-02-19 NeilBrown <neilb@cse.unsw.edu.au> + Ben Leslie <benno@sesgroup.net> + + * support/nfs/rpcmisc.c(rpc_init): change test for ignoring + "defport" from (__rpcfdtype == 0) to (__rpcpmstart==0). The + former would incorectly ignore defport if the application + explicitly set __rpcfdtype. The later is sufficient to avoid the + special handling in the case where stdin is an internet socket. + + * utils/mountd/mountd.c(main): Add 'n' to option list in + getopt_long as this is a short form of --no-tcp which want being + checked. + 2003-02-12 Chip Salzenberg <chip@pobox.com> * debian/changelog: Version 1.0.2-2. diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c index 7a100c2..ca63c81 100644 --- a/support/nfs/rpcmisc.c +++ b/support/nfs/rpcmisc.c @@ -66,7 +66,7 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport) if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_DGRAM)) { static SVCXPRT *last_transp = NULL; - if (_rpcfdtype == 0) { + if (_rpcpmstart == 0) { if (last_transp && (!defport || defport == last_transp->xp_port)) { transp = last_transp; @@ -96,7 +96,7 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport) if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_STREAM)) { static SVCXPRT *last_transp = NULL; - if (_rpcfdtype == 0) { + if (_rpcpmstart == 0) { if (last_transp && (!defport || defport == last_transp->xp_port)) { transp = last_transp; diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index f785ef2..971e4f4 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -399,7 +399,7 @@ main(int argc, char **argv) /* Parse the command line options and arguments. */ opterr = 0; - while ((c = getopt_long(argc, argv, "o:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF) + while ((c = getopt_long(argc, argv, "on:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF) switch (c) { case 'o': descriptors = atoi(optarg); |