svn commit: r360148 - in releng: 11.3/usr.bin/quota 12.1/usr.bin/quota

[Gordon Tetlow]

Author: gordon
Date: Tue Apr 21 15:50:57 2020
New Revision: 360148
URL: https://svnweb.freebsd.org/changeset/base/360148

Log:
  Fix regression in rpc.rquotad with certain NFS servers.
  
  Approved by:	so
  Security:	FreeBSD-EN-20:07.quotad

Modified:
  releng/11.3/usr.bin/quota/quota.c
  releng/12.1/usr.bin/quota/quota.c

Modified: releng/11.3/usr.bin/quota/quota.c
==============================================================================
--- releng/11.3/usr.bin/quota/quota.c	Tue Apr 21 15:47:58 2020	(r360147)
+++ releng/11.3/usr.bin/quota/quota.c	Tue Apr 21 15:50:57 2020	(r360148)
@@ -604,7 +604,7 @@ getnfsquota(struct statfs *fst, struct quotause *qup, 
 	call_stat = callaurpc(host, RQUOTAPROG, EXT_RQUOTAVERS,
 			      RQUOTAPROC_GETQUOTA, (xdrproc_t)xdr_ext_getquota_args, (char *)&gq_args,
 			      (xdrproc_t)xdr_getquota_rslt, (char *)&gq_rslt);
-	if (call_stat == RPC_PROGVERSMISMATCH) {
+	if (call_stat == RPC_PROGVERSMISMATCH || call_stat == RPC_PROGNOTREGISTERED) {
 		if (quotatype == USRQUOTA) {
 			old_gq_args.gqa_pathp = cp + 1;
 			old_gq_args.gqa_uid = id;

Modified: releng/12.1/usr.bin/quota/quota.c
==============================================================================
--- releng/12.1/usr.bin/quota/quota.c	Tue Apr 21 15:47:58 2020	(r360147)
+++ releng/12.1/usr.bin/quota/quota.c	Tue Apr 21 15:50:57 2020	(r360148)
@@ -606,7 +606,7 @@ getnfsquota(struct statfs *fst, struct quotause *qup, 
 	call_stat = callaurpc(host, RQUOTAPROG, EXT_RQUOTAVERS,
 			      RQUOTAPROC_GETQUOTA, (xdrproc_t)xdr_ext_getquota_args, (char *)&gq_args,
 			      (xdrproc_t)xdr_getquota_rslt, (char *)&gq_rslt);
-	if (call_stat == RPC_PROGVERSMISMATCH) {
+	if (call_stat == RPC_PROGVERSMISMATCH || call_stat == RPC_PROGNOTREGISTERED) {
 		if (quotatype == USRQUOTA) {
 			old_gq_args.gqa_pathp = cp + 1;
 			old_gq_args.gqa_uid = id;