diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 86c7d00d1c5d..ba20c3cdc627 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -563,7 +563,10 @@ ypproc_all_2_svc(ypreq_nokey *argp, struct svc_req *rqstp)
 	 * Proper fix for PR #10970: exit here so that we don't risk
 	 * having a child spawned from this sub-process.
 	 */
-	_exit(0);
+	if (!debug)
+		_exit(0);
+
+	return &result;
 }
 
 ypresp_master *