From patchwork Mon Oct 29 17:35:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [9/9] nsdbc: Remove default NCE of "o=fedfs" Date: Mon, 29 Oct 2012 07:35:48 -0000 From: Chuck Lever X-Patchwork-Id: 195089 Message-Id: <20121029173548.53098.27140.stgit@seurat.1015granger.net> To: fedfs-utils-devel@oss.oracle.com The man pages for the nsdb-update-nci and nsdb-remove-nci commands do not mention a default NCE (in fact, they say that the commands fail if no NCE is specified). The NSDB protocol specification hints that "o=fedfs" is the preferred default, but otherwise there's no good reason to choose that as a default value. Remove it. --- src/include/nsdb.h | 5 ----- src/nsdbc/nsdb-remove-nci.c | 2 -- src/nsdbc/nsdb-update-nci.c | 2 -- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/src/include/nsdb.h b/src/include/nsdb.h index 8afefaa..89d2505 100644 --- a/src/include/nsdb.h +++ b/src/include/nsdb.h @@ -33,11 +33,6 @@ #include "fedfs.h" /** - * Default DN of FedFS NSDB containers - */ -#define NSDB_DEFAULT_NCE "o=fedfs" - -/** * Object that internally represents an NSDB */ struct fedfs_nsdb; diff --git a/src/nsdbc/nsdb-remove-nci.c b/src/nsdbc/nsdb-remove-nci.c index 76d2e8b..ddbfb9f 100644 --- a/src/nsdbc/nsdb-remove-nci.c +++ b/src/nsdbc/nsdb-remove-nci.c @@ -125,8 +125,6 @@ main(int argc, char **argv) xlog_open(progname); nsdb_env(&nsdbname, &nsdbport, &binddn, &nce); - if (nce == NULL) - nce = NSDB_DEFAULT_NCE; while ((arg = getopt_long(argc, argv, nsdb_remove_nci_opts, nsdb_remove_nci_longopts, NULL)) != -1) { diff --git a/src/nsdbc/nsdb-update-nci.c b/src/nsdbc/nsdb-update-nci.c index 50ffdb0..3fdcaf6 100644 --- a/src/nsdbc/nsdb-update-nci.c +++ b/src/nsdbc/nsdb-update-nci.c @@ -129,8 +129,6 @@ main(int argc, char **argv) xlog_open(progname); nsdb_env(&nsdbname, &nsdbport, &binddn, &nce); - if (nce == NULL) - nce = NSDB_DEFAULT_NCE; delete = false; while ((arg = getopt_long(argc, argv, nsdb_update_nci_opts,