From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 2 Mar 2011 14:14:39 +0000 (+0000)
Subject: check security-related incompatible args (ITS#6849)
X-Git-Tag: MIGRATION_CVS2GIT~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7a8eff546818e6893db30281bc6c6069cb7fe3b;p=openldap

check security-related incompatible args (ITS#6849)
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index da14c60e85..262631e4ca 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1197,6 +1197,12 @@ tool_args( int argc, char **argv )
 		}
 #endif
 	}
+
+	if ( ( pw_file || want_bindpw ) && !BER_BVISNULL( &passwd ) ) {
+		fprintf( stderr, "%s: -%c incompatible with -w\n",
+			prog, ( pw_file ? 'y' : 'W' ) );
+		exit( EXIT_FAILURE );
+	}
 }