diff -ruN openldap-2.3.34.orig/servers/slapd/main.c openldap-2.3.34/servers/slapd/main.c
--- openldap-2.3.34.orig/servers/slapd/main.c	2007-01-25 22:42:38 +1000
+++ openldap-2.3.34/servers/slapd/main.c	2007-02-22 19:45:29 +1000
@@ -789,7 +789,7 @@
 	mal_leaktrace(1);
 #endif
 
-	if ( slapd_pid_file != NULL ) {
+	if ( (check != CHECK_CONFIG) && (slapd_pid_file != NULL) ) {
 		FILE *fp = fopen( slapd_pid_file, "w" );
 
 		if ( fp == NULL ) {
@@ -811,7 +811,7 @@
 		slapd_pid_file_unlink = 1;
 	}
 
-	if ( slapd_args_file != NULL ) {
+	if ( (check != CHECK_CONFIG) && (slapd_args_file != NULL) ) {
 		FILE *fp = fopen( slapd_args_file, "w" );
 
 		if ( fp == NULL ) {