svn commit: r293804 - stable/9/lib/libc/yp

[Gleb Smirnoff]

Author: glebius
Date: Wed Jan 13 05:32:24 2016
New Revision: 293804
URL: https://svnweb.freebsd.org/changeset/base/293804

Log:
  Merge r291073:
    If a NIS server has long entries on its database that is bigger than
    1024 specified on YPMAXRECORD the ypmatch can get in an infinite retry
    loop when is requesting the information from the NIS server.
  
    The ypmatch(1) will return an error until the command receives an
    kill(1).
  
    To avoid this problem, we check the MAX_RETRIES that is by default set
    to 20 and avoid get in infinet loop at the client side.

Modified:
  stable/9/lib/libc/yp/yplib.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/yp/yplib.c
==============================================================================
--- stable/9/lib/libc/yp/yplib.c	Wed Jan 13 04:11:04 2016	(r293803)
+++ stable/9/lib/libc/yp/yplib.c	Wed Jan 13 05:32:24 2016	(r293804)
@@ -653,7 +653,7 @@ yp_match(char *indomain, char *inmap, co
 	struct timeval tv;
 	struct ypreq_key yprk;
 	int r;
-
+	int retries = 0;
 	*outval = NULL;
 	*outvallen = 0;
 
@@ -691,6 +691,11 @@ yp_match(char *indomain, char *inmap, co
 #endif
 
 again:
+	if (retries > MAX_RETRIES) {
+		YPUNLOCK();
+		return (YPERR_RPC);
+	}
+
 	if (_yp_dobind(indomain, &ysd) != 0) {
 		YPUNLOCK();
 		return (YPERR_DOMAIN);
@@ -707,6 +712,7 @@ again:
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_match: clnt_call");
 		_yp_unbind(ysd);
+		retries++;
 		goto again;
 	}
 
@@ -756,7 +762,7 @@ yp_first(char *indomain, char *inmap, ch
 	struct dom_binding *ysd;
 	struct timeval tv;
 	int r;
-
+	int retries = 0;
 	/* Sanity check */
 
 	if (indomain == NULL || !strlen(indomain) ||
@@ -768,6 +774,11 @@ yp_first(char *indomain, char *inmap, ch
 
 	YPLOCK();
 again:
+	if (retries > MAX_RETRIES) {
+		YPUNLOCK();
+		return (YPERR_RPC);
+	}
+
 	if (_yp_dobind(indomain, &ysd) != 0) {
 		YPUNLOCK();
 		return (YPERR_DOMAIN);
@@ -786,6 +797,7 @@ again:
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_first: clnt_call");
 		_yp_unbind(ysd);
+		retries++;
 		goto again;
 	}
 	if (!(r = ypprot_err(yprkv.stat))) {
@@ -813,7 +825,7 @@ yp_next(char *indomain, char *inmap, cha
 	struct dom_binding *ysd;
 	struct timeval tv;
 	int r;
-
+	int retries = 0;
 	/* Sanity check */
 
 	if (inkey == NULL || !strlen(inkey) || inkeylen <= 0 ||
@@ -826,6 +838,11 @@ yp_next(char *indomain, char *inmap, cha
 
 	YPLOCK();
 again:
+	if (retries > MAX_RETRIES) {
+		YPUNLOCK();
+		return (YPERR_RPC);
+	}
+
 	if (_yp_dobind(indomain, &ysd) != 0) {
 		YPUNLOCK();
 		return (YPERR_DOMAIN);
@@ -846,6 +863,7 @@ again:
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_next: clnt_call");
 		_yp_unbind(ysd);
+		retries++;
 		goto again;
 	}
 	if (!(r = ypprot_err(yprkv.stat))) {
@@ -874,7 +892,7 @@ yp_all(char *indomain, char *inmap, stru
 	CLIENT *clnt;
 	u_long status, savstat;
 	int clnt_sock;
-
+	int retries = 0;
 	/* Sanity check */
 
 	if (indomain == NULL || !strlen(indomain) ||
@@ -883,6 +901,10 @@ yp_all(char *indomain, char *inmap, stru
 
 	YPLOCK();
 again:
+	if (retries > MAX_RETRIES) {
+		YPUNLOCK();
+		return (YPERR_RPC);
+	}
 
 	if (_yp_dobind(indomain, &ysd) != 0) {
 		YPUNLOCK();
@@ -912,9 +934,10 @@ again:
 	if (clnt_call(clnt, YPPROC_ALL,
 		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
 		(xdrproc_t)xdr_ypresp_all_seq, &status, tv) != RPC_SUCCESS) {
-			clnt_perror(ysd->dom_client, "yp_all: clnt_call");
+			clnt_perror(clnt, "yp_all: clnt_call");
 			clnt_destroy(clnt);
 			_yp_unbind(ysd);
+			retries++;
 			goto again;
 	}