From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 17 Nov 1999 21:47:08 +0000 (+0000)
Subject: ITS#352: don't pring NULL group names.
X-Git-Tag: UCDATA_2_4~204
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f6f7d06a6a3d3c4f8f842fae35361efb1bb3cf6;p=openldap

ITS#352: don't pring NULL group names.
---

diff --git a/clients/ud/group.c b/clients/ud/group.c
index 98936c7886..9a2f283a3d 100644
--- a/clients/ud/group.c
+++ b/clients/ud/group.c
@@ -215,9 +215,9 @@ remove_group( char *name )
 	if ((dn = bind_and_fetch(name)) == NULL)
 		return;
 
-	printf("\n  The group '%s' will be permanently removed from\n",
-		name);
-	printf("  the Directory.  Are you absolutely sure that you want to\n" );	printf("  remove this entire group? ");
+	printf("\n  The entry\n    '%s'\n  will be permanently removed from", dn);
+	printf(" the Directory.\n  Are you absolutely sure that you want to" );
+	printf(" remove this entire group? ");
 	fflush(stdout);
 	fetch_buffer(tmp, sizeof(tmp), stdin);
 	if (!(tmp[0] == 'y' || tmp[0] == 'Y'))
@@ -230,7 +230,7 @@ remove_group( char *name )
 		int ld_errno = 0;
 		ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
 		if (ld_errno == LDAP_INSUFFICIENT_ACCESS)
-			printf("  You do not own the group \"%s\".\n", name);
+			printf("  You do not own the entry\n\t\"%s\".\n", dn);
 		else
 			ldap_perror(ld, "  ldap_delete_s");
 		printf("  Group not removed.\n");