Patchwork [7/9] nsdbc: Update nsdb-nces message

login
register
mail settings
Submitter Chuck Lever
Date Oct. 29, 2012, 5:35 p.m.
Message ID <20121029173528.53098.78574.stgit@seurat.1015granger.net>
Download mbox | patch
Permalink /patch/195097/
State Accepted
Headers show

Comments

Chuck Lever - Oct. 29, 2012, 5:35 p.m.
"naming context o=fedfs is not a FedFS NCE" is not accurate.

A naming context can be an NCE, but usually the NCE is a descendent
entry.  Update this message to make better sense.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 doc/man/nsdb-nces.8   |    6 +++---
 src/nsdbc/nsdb-nces.c |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/doc/man/nsdb-nces.8 b/doc/man/nsdb-nces.8
index ddbf8e4..fbd18cc 100644
--- a/doc/man/nsdb-nces.8
+++ b/doc/man/nsdb-nces.8
@@ -218,11 +218,11 @@  $ nsdb-nces -l ldap.example.net
 .br
 Host: ldap.example.net:389
 .br
-  namingContext 'dc=example,dc=net' is not a FedFS NCE.
+  namingContext 'dc=example,dc=net' does not host an NCE.
 .br
-  namingContext 'o=fedfs' is a FedFS NCE, DIT starts at 'o=fedfs'.
+  namingContext 'o=fedfs' hosts an NCE at 'o=fedfs'.
 .br
-  namingContext 'o=netscaperoot' is not a FedFS NCE.
+  namingContext 'o=netscaperoot' does not host an NCE.
 .sp
 .RE
 This shows there are three LDAP naming contexts on the target LDAP server.
diff --git a/src/nsdbc/nsdb-nces.c b/src/nsdbc/nsdb-nces.c
index edfdf67..ec7b9d9 100644
--- a/src/nsdbc/nsdb-nces.c
+++ b/src/nsdbc/nsdb-nces.c
@@ -216,11 +216,10 @@  main(int argc, char **argv)
 		retval = nsdb_get_nceprefix_s(host, contexts[i], &dn, &ldap_err);
 		printf("  namingContext '%s' ", contexts[i]);
 		if (retval == FEDFS_OK) {
-			printf("is a FedFS NCE, DIT starts at '%s'.\n", dn);
+			printf("hosts an NCE at '%s'.\n", dn);
 			free(dn);
-			retval = FEDFS_OK;
 		} else
-			printf("is not a FedFS NCE.\n");
+			printf("does not host an NCE.\n");
 	}
 
 	nsdb_free_string_array(contexts);