See Changelog

diff --git a/ChangeLog b/ChangeLog
index a2c7629bbf1fcd15489d78c02e31fbd464f69053..42451643471e5eac0f4a0d75796c30eb235973fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 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 7a100c2eff618f089c1c9c0b7712bc1fde250992..ca63c8142975940557ba6ed9470e594d720f284a 100644 (file)
--- 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) || (_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;
                        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) || (_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;
                        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 f785ef23e6a75a45727081c5a8d217595139812b..971e4f4e2be8ca774328aed24c921bdea4f7edcc 100644 (file)
--- 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;
 
        /* 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);
                switch (c) {
                case 'o':
                        descriptors = atoi(optarg);