[fedfs-utils] [PATCH 1/6] nsdbc: man page says "--passwd" but code has "--password"
Chuck Lever
chuck.lever at oracle.com
Mon Oct 10 14:04:23 PDT 2011
In this case, the intended option name is "--passwd," as the man page
states, so fix up the code.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---
src/nsdbc/nsdb-annotate.c | 4 ++--
src/nsdbc/nsdb-create-fsl.c | 4 ++--
src/nsdbc/nsdb-create-fsn.c | 4 ++--
src/nsdbc/nsdb-delete-fsl.c | 4 ++--
src/nsdbc/nsdb-delete-fsn.c | 4 ++--
src/nsdbc/nsdb-delete-nsdb.c | 4 ++--
src/nsdbc/nsdb-describe.c | 4 ++--
src/nsdbc/nsdb-remove-nci.c | 4 ++--
src/nsdbc/nsdb-update-fsl.c | 4 ++--
src/nsdbc/nsdb-update-nci.c | 4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/nsdbc/nsdb-annotate.c b/src/nsdbc/nsdb-annotate.c
index a148a93..79230a6 100644
--- a/src/nsdbc/nsdb-annotate.c
+++ b/src/nsdbc/nsdb-annotate.c
@@ -63,7 +63,7 @@ static const struct option nsdb_annotate_longopts[] = {
{ "keyword", 1, NULL, 'k', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ "value", 1, NULL, 'v', },
{ NULL, 0, NULL, 0, },
};
@@ -91,7 +91,7 @@ nsdb_annotate_usage(const char *progname)
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
fprintf(stderr, "\t-v, --value Annotation value\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-y, --delete Delete specified annotation\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-create-fsl.c b/src/nsdbc/nsdb-create-fsl.c
index d7c148f..55bf5d6 100644
--- a/src/nsdbc/nsdb-create-fsl.c
+++ b/src/nsdbc/nsdb-create-fsl.c
@@ -67,7 +67,7 @@ static const struct option nsdb_create_fsl_longopts[] = {
{ "servername", 1, NULL, 's', },
{ "serverpath", 1, NULL, 'p', },
{ "serverport", 1, NULL, 'o', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -95,7 +95,7 @@ nsdb_create_fsl_usage(const char *progname)
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
fprintf(stderr, "\t-s, --servername File server hostname to set\n");
fprintf(stderr, "\t-o, --serverport File server port to set\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-u, --fsnuuid FSN UUID of FSL's parent\n");
fprintf(stderr, "\t-x, --fsluuid New FSL UUID\n");
diff --git a/src/nsdbc/nsdb-create-fsn.c b/src/nsdbc/nsdb-create-fsn.c
index be6f67a..ad0e512 100644
--- a/src/nsdbc/nsdb-create-fsn.c
+++ b/src/nsdbc/nsdb-create-fsn.c
@@ -63,7 +63,7 @@ static const struct option nsdb_create_fsn_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -87,7 +87,7 @@ nsdb_create_fsn_usage(const char *progname)
fprintf(stderr, "\t-e, --nce DN of NSDB container entry\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-u, --fsnuuid New FSN UUID\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-delete-fsl.c b/src/nsdbc/nsdb-delete-fsl.c
index 01c5765..2793ee2 100644
--- a/src/nsdbc/nsdb-delete-fsl.c
+++ b/src/nsdbc/nsdb-delete-fsl.c
@@ -67,7 +67,7 @@ static const struct option nsdb_delete_fsl_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -91,7 +91,7 @@ nsdb_delete_fsl_usage(const char *progname)
fprintf(stderr, "\t-e, --nce DN of NSDB container entry\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-x, --fsluuid FSL UUID to remove\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-delete-fsn.c b/src/nsdbc/nsdb-delete-fsn.c
index d6fcfee..3e19261 100644
--- a/src/nsdbc/nsdb-delete-fsn.c
+++ b/src/nsdbc/nsdb-delete-fsn.c
@@ -64,7 +64,7 @@ static const struct option nsdb_delete_fsn_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -87,7 +87,7 @@ nsdb_delete_fsn_usage(const char *progname)
fprintf(stderr, "\t-e, --nce DN of NSDB container entry\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-u, --fsnuuid FSN UUID to remove\n");
fprintf(stderr, "\t-y, --leavefsn Delete FSLs but leave FSN\n");
diff --git a/src/nsdbc/nsdb-delete-nsdb.c b/src/nsdbc/nsdb-delete-nsdb.c
index 040bf0d..e25d821 100644
--- a/src/nsdbc/nsdb-delete-nsdb.c
+++ b/src/nsdbc/nsdb-delete-nsdb.c
@@ -58,7 +58,7 @@ static const struct option nsdb_delete_nsdb_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -81,7 +81,7 @@ nsdb_delete_nsdb_usage(const char *progname)
fprintf(stderr, "\t-e, --nce DN of NSDB container entry to remove\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-describe.c b/src/nsdbc/nsdb-describe.c
index 1a9c5d1..9576812 100644
--- a/src/nsdbc/nsdb-describe.c
+++ b/src/nsdbc/nsdb-describe.c
@@ -62,7 +62,7 @@ static const struct option nsdb_describe_longopts[] = {
{ "help", 0, NULL, '?', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -87,7 +87,7 @@ nsdb_describe_usage(const char *progname)
fprintf(stderr, "\t-e, --entry DN of entry to update\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-y, --delete Delete specified description\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-remove-nci.c b/src/nsdbc/nsdb-remove-nci.c
index 8bfe3a1..d6a1040 100644
--- a/src/nsdbc/nsdb-remove-nci.c
+++ b/src/nsdbc/nsdb-remove-nci.c
@@ -58,7 +58,7 @@ static const struct option nsdb_remove_nci_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -81,7 +81,7 @@ nsdb_remove_nci_usage(const char *progname)
fprintf(stderr, "\t-e, --nce DN of NSDB container entry to remove\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-update-fsl.c b/src/nsdbc/nsdb-update-fsl.c
index 7ef9f05..e30d8cd 100644
--- a/src/nsdbc/nsdb-update-fsl.c
+++ b/src/nsdbc/nsdb-update-fsl.c
@@ -68,7 +68,7 @@ static const struct option nsdb_update_fsl_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ "value", 1, NULL, 'v', },
{ NULL, 0, NULL, 0, },
};
@@ -95,7 +95,7 @@ nsdb_update_fsl_usage(const char *progname)
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
fprintf(stderr, "\t-v, --value New attribute value\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-x, --fsluuid FSL UUID of FSL to update\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
diff --git a/src/nsdbc/nsdb-update-nci.c b/src/nsdbc/nsdb-update-nci.c
index 440fe12..84cb3dc 100644
--- a/src/nsdbc/nsdb-update-nci.c
+++ b/src/nsdbc/nsdb-update-nci.c
@@ -60,7 +60,7 @@ static const struct option nsdb_update_nci_longopts[] = {
{ "nce", 1, NULL, 'e', },
{ "nsdbname", 1, NULL, 'l', },
{ "nsdbport", 1, NULL, 'r', },
- { "password", 1, NULL, 'w', },
+ { "passwd", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -84,7 +84,7 @@ nsdb_update_nci_usage(const char *progname)
fprintf(stderr, "\t-e, --nce Full DN of NCE\n");
fprintf(stderr, "\t-l, --nsdbname NSDB hostname\n");
fprintf(stderr, "\t-r, --nsdbport NSDB port\n");
- fprintf(stderr, "\t-w, --password Bind password\n");
+ fprintf(stderr, "\t-w, --passwd Bind password\n");
fprintf(stderr, "\t-y, --delete Delete NSDB container info\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
More information about the fedfs-utils-devel
mailing list