X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapdn.c;h=0119e7fab595d4cf500938204fcb1ea57db3e378;hb=61312e7989b6b0cf97b859caf4b43fa7e70741c8;hp=e0a40d6541de3de79c80a2d6ddce77b7dc16b1d5;hpb=2919bc09ac89efb58f9c23ddf49d471452157384;p=openldap

diff --git a/servers/slapd/slapdn.c b/servers/slapd/slapdn.c
index e0a40d6541..0119e7fab5 100644
--- a/servers/slapd/slapdn.c
+++ b/servers/slapd/slapdn.c
@@ -1,6 +1,6 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -40,9 +40,6 @@ slapdn( int argc, char **argv )
 	int			rc = 0;
 	const char		*progname = "slapdn";
 
-#ifdef NEW_LOGGING
-	lutil_log_initialize( argc, argv );
-#endif
 	slap_tool_init( progname, SLAPDN, argc, argv );
 
 	argv = &argv[ optind ];
@@ -65,11 +62,24 @@ slapdn( int argc, char **argv )
 			}
 			
 		} else {
-			fprintf( stderr, "DN: <%s> check succeeded\n"
-					"normalized: <%s>\n"
-					"pretty:     <%s>\n",
-					dn.bv_val,
-					ndn.bv_val, pdn.bv_val );
+			switch ( dn_mode ) {
+			case SLAP_TOOL_LDAPDN_PRETTY:
+				printf( "%s\n", pdn.bv_val );
+				break;
+
+			case SLAP_TOOL_LDAPDN_NORMAL:
+				printf( "%s\n", ndn.bv_val );
+				break;
+
+			default:
+				printf( "DN: <%s> check succeeded\n"
+						"normalized: <%s>\n"
+						"pretty:     <%s>\n",
+						dn.bv_val,
+						ndn.bv_val, pdn.bv_val );
+				break;
+			}
+
 			ch_free( ndn.bv_val );
 			ch_free( pdn.bv_val );
 		}