3 files changed, 0 insertions, 12 deletions

diff --git a/lib/libypclnt/ypclnt.h b/lib/libypclnt/ypclnt.h
index 16efd97c4c0a6..9cd204827726f 100644
--- a/lib/libypclnt/ypclnt.h
+++ b/lib/libypclnt/ypclnt.h
@@ -53,10 +53,4 @@ int		 ypclnt_connect(ypclnt_t *);
 int		 ypclnt_havepasswdd(ypclnt_t *);
 int		 ypclnt_passwd(ypclnt_t *, const struct passwd *, const char *);
 
-#if defined(DEBUG) && defined(__GNUC__)
-#define YPCLNT_DEBUG(fmt...) warnx(__FUNCTION__ ": " fmt, ##fmt)
-#else
-#define YPCLNT_DEBUG(...)
-#endif
-
 #endif
diff --git a/lib/libypclnt/ypclnt_connect.c b/lib/libypclnt/ypclnt_connect.c
index 5670fa4425879..25d2f9ffb1c39 100644
--- a/lib/libypclnt/ypclnt_connect.c
+++ b/lib/libypclnt/ypclnt_connect.c
@@ -64,7 +64,6 @@ ypclnt_connect(ypclnt_t *ypclnt)
 			return (-1);
 		}
 	}
-	YPCLNT_DEBUG("domain '%s'", ypclnt->domain);
 
 	/* map must be specified */
 	if (ypclnt->map == NULL) {
@@ -72,7 +71,6 @@ ypclnt_connect(ypclnt_t *ypclnt)
 		    "caller must specify map name");
 		return (-1);
 	}
-	YPCLNT_DEBUG("map '%s'", ypclnt->map);
 
 	/* get master server for requested map unless specified */
 	if (ypclnt->server == NULL) {
@@ -83,7 +81,6 @@ ypclnt_connect(ypclnt_t *ypclnt)
 			return (-1);
 		}
 	}
-	YPCLNT_DEBUG("server '%s'", ypclnt->server);
 
 	ypclnt_error(ypclnt, NULL, NULL);
 	return (0);
diff --git a/lib/libypclnt/ypclnt_passwd.c b/lib/libypclnt/ypclnt_passwd.c
index 648379430aba3..c7ee7eafb1085 100644
--- a/lib/libypclnt/ypclnt_passwd.c
+++ b/lib/libypclnt/ypclnt_passwd.c
@@ -119,13 +119,10 @@ ypclnt_passwd(ypclnt_t *ypclnt, const struct passwd *pwd, const char *passwd)
 {
 	switch (ypclnt_havepasswdd(ypclnt)) {
 	case 0:
-		YPCLNT_DEBUG("using remote update method");
 		return (yppasswd_remote(ypclnt, pwd, passwd));
 	case 1:
-		YPCLNT_DEBUG("using local update method");
 		return (yppasswd_local(ypclnt, pwd));
 	default:
-		YPCLNT_DEBUG("no rpc.yppasswdd");
 		return (-1);
 	}
 }