@@ -42,7 +42,7 @@ nsdb-annotate \- modify the fedfsAnnotation attribute of an NSDB entry
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.RB [ \-v
.IR value ]
.SH INTRODUCTION
@@ -175,7 +175,7 @@ If the
option is specified and this value exists in the target
entry's fedfsAnnotation attribute, it is removed.
Otherwise the value is added.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -38,7 +38,7 @@ nsdb-create-fsl \- create a fileset location (FSL) record on an NSDB
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.B \-u
.I fsn-uuid
.B \-x
@@ -185,7 +185,7 @@ command fails.
Specifies the IP port of the file server a client should mount to access
this fileset location.
The default value if this option is not specified is 2049.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -38,7 +38,7 @@ nsdb-create-fsn \- create a fileset name (FSN) record on an NSDB
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.B \-u
.I fsn-uuid
.SH INTRODUCTION
@@ -149,7 +149,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -38,7 +38,7 @@ nsdb-delete-fsl \- delete a fileset location (FSL) record from an NSDB
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.B \-u
.I fsn-uuid
.B \-x
@@ -160,7 +160,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -38,7 +38,7 @@ nsdb-delete-fsn \- delete a fileset name (FSN) record from an NSDB
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.B \-u
.I fsn-uuid
.SH INTRODUCTION
@@ -157,7 +157,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -36,7 +36,7 @@ nsdb-delete-nsdb \- remove all FedFS info from an NSDB
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.RB \-e
.IR nce
.SH INTRODUCTION
@@ -116,7 +116,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -40,7 +40,7 @@ nsdb-describe \- modify the fedfsDescr attribute of an NSDB entry
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.SH INTRODUCTION
RFC 5716 introduces the Federated File System (FedFS, for short).
FedFS is an extensible standardized mechanism
@@ -140,7 +140,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -38,7 +38,7 @@ nsdb-remove-nci \- remove NSDB container information from an LDAP server
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.SH INTRODUCTION
RFC 5716 introduces the Federated File System (FedFS, for short).
FedFS is an extensible standardized mechanism
@@ -144,7 +144,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -35,7 +35,7 @@ nsdb-resolve-fsn \- resolve a fileset name (FSN) record on an NSDB
.IR nsdbname ]
.RB [ \-r
.IR nsdbport ]
-.RB [ \-w
+.B \-u
.I fsn-uuid
.SH INTRODUCTION
RFC 5716 introduces the Federated File System (FedFS, for short).
@@ -38,7 +38,7 @@ nsdb-update-fsl \- update attributes of a fileset location (FSL) record
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.B \-u
.I fsn-uuid
.B \-x
@@ -188,7 +188,7 @@ If the
option is not specified, the
.BR nsdb-update-fsl (8)
command attempts to delete the specified attribute.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -38,7 +38,7 @@ nsdb-update-nci \- update NSDB container information on an LDAP server
.RB [ \-r
.IR nsdbport ]
.RB [ \-w
-.IR passwd ]
+.IR bindpw ]
.SH INTRODUCTION
RFC 5716 introduces the Federated File System (FedFS, for short).
FedFS is an extensible standardized mechanism
@@ -145,7 +145,7 @@ If the
option is not specified,
the value of the FEDFS_NSDB_PORT environment variable is consulted.
The default value if the variable is not set is 389.
-.IP "\fB\-w, \-\-passwd=\fIbinddn-password\fP"
+.IP "\fB\-w, \-\-bindpw=\fIbinddn-password\fP"
Specifies the password used for simple authentication to this LDAP server.
If the
.B -w
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ "value", 1, NULL, 'v', },
{ NULL, 0, NULL, 0, },
};
@@ -77,7 +77,7 @@ static void
nsdb_annotate_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] -e entry "
"[ -a annotation ] [ -k keyword ] [ -v value ] [ -y ]\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-y, --delete Delete specified annotation\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -109,7 +109,7 @@ nsdb_annotate_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
char *keyword, *value, *entry, *annotation;
unsigned short nsdbport;
unsigned int ldap_err;
@@ -138,7 +138,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, NULL, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, NULL, &bindpw);
delete = false;
keyword = value = entry = annotation = NULL;
@@ -174,7 +174,7 @@ main(int argc, char **argv)
value = optarg;
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'y':
delete = true;
@@ -248,7 +248,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -80,7 +80,7 @@ static void
nsdb_create_fsl_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] [ -e nce ] "
"-u fsn-uuid -x fsl-uuid -s servername "
"[ -o serverport ] -p serverpath\n\n",
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-u, --fsnuuid FSN UUID of FSL's parent\n");
fprintf(stderr, "\t-x, --fsluuid New FSL UUID\n");
@@ -115,7 +115,7 @@ int
main(int argc, char **argv)
{
char *nce, *fsn_uuid, *fsl_uuid, *servername, *serverpath;
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
unsigned short nsdbport, serverport;
unsigned int ldap_err;
FedFsStatus retval;
@@ -143,7 +143,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
serverport = 0;
fsn_uuid = fsl_uuid = servername = serverpath = NULL;
@@ -183,7 +183,7 @@ main(int argc, char **argv)
servername = optarg;
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'u':
if (uuid_parse(optarg, uu) == -1) {
@@ -233,7 +233,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -76,7 +76,7 @@ static void
nsdb_create_fsn_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] [ -e nce ] "
"-u fsn-uuid\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-u, --fsnuuid New FSN UUID\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -105,7 +105,7 @@ nsdb_create_fsn_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
unsigned short nsdbport;
unsigned int ldap_err;
char *nce, *fsn_uuid;
@@ -134,7 +134,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
fsn_uuid = NULL;
while ((arg = getopt_long(argc, argv, nsdb_create_fsn_opts,
@@ -160,7 +160,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'u':
if (uuid_parse(optarg, uu) == -1) {
@@ -202,7 +202,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -80,7 +80,7 @@ static void
nsdb_delete_fsl_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] [ -e nce ] "
"-x fsl-uuid\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-x, --fsluuid FSL UUID to remove\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -109,7 +109,7 @@ nsdb_delete_fsl_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
char *nce, *fsl_uuid;
unsigned short nsdbport;
unsigned int ldap_err;
@@ -138,7 +138,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
fsl_uuid = NULL;
while ((arg = getopt_long(argc, argv, nsdb_delete_fsl_opts,
@@ -164,7 +164,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'x':
if (uuid_parse(optarg, uu) == -1) {
@@ -206,7 +206,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -77,7 +77,7 @@ static void
nsdb_delete_fsn_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] [ -e nce ] "
"[-y] -u fsn-uuid\n\n", progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-u, --fsnuuid FSN UUID to remove\n");
fprintf(stderr, "\t-y, --leavefsn Delete FSLs but leave FSN\n");
@@ -106,7 +106,7 @@ nsdb_delete_fsn_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
unsigned short nsdbport;
unsigned int ldap_err;
char *nce, *fsn_uuid;
@@ -136,7 +136,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
leave_fsn = false;
fsn_uuid = NULL;
@@ -163,7 +163,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'u':
if (uuid_parse(optarg, uu) == -1) {
@@ -208,7 +208,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -71,7 +71,7 @@ static void
nsdb_delete_nsdb_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] -e nce\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -98,7 +98,7 @@ nsdb_delete_nsdb_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
unsigned short nsdbport;
unsigned int ldap_err;
FedFsStatus retval;
@@ -126,7 +126,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, NULL, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, NULL, &bindpw);
nce = NULL;
while ((arg = getopt_long(argc, argv, nsdb_delete_nsdb_opts,
@@ -152,7 +152,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
default:
fprintf(stderr, "Invalid command line "
@@ -187,7 +187,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -75,7 +75,7 @@ static void
nsdb_describe_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -b ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -b ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] -e entry "
"[ -a description] [-y]\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-y, --delete Delete specified description\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -105,7 +105,7 @@ nsdb_describe_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
char *description, *entry;
unsigned short nsdbport;
unsigned int ldap_err;
@@ -134,7 +134,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, NULL, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, NULL, &bindpw);
delete = false;
entry = description = NULL;
@@ -164,7 +164,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'y':
delete = true;
@@ -206,7 +206,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -71,7 +71,7 @@ static void
nsdb_remove_nci_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] [ -e nce ]\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -98,7 +98,7 @@ nsdb_remove_nci_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
unsigned short nsdbport;
unsigned int ldap_err;
FedFsStatus retval;
@@ -126,7 +126,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
if (nce == NULL)
nce = NSDB_DEFAULT_NCE;
@@ -153,7 +153,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
default:
fprintf(stderr, "Invalid command line "
@@ -188,7 +188,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ "value", 1, NULL, 'v', },
{ NULL, 0, NULL, 0, },
};
@@ -82,7 +82,7 @@ static void
nsdb_update_fsl_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] [ -e nce ] [ -v value ] "
"-a attribute -x fsl-uuid\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-x, --fsluuid FSL UUID of FSL to update\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -113,7 +113,7 @@ nsdb_update_fsl_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname;
+ char *progname, *binddn, *bindpw, *nsdbname;
char *nce, *fsl_uuid, *attribute, *value;
unsigned short nsdbport;
unsigned int ldap_err;
@@ -142,7 +142,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
fsl_uuid = attribute = value = NULL;
while ((arg = getopt_long(argc, argv, nsdb_update_fsl_opts,
@@ -171,7 +171,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'v':
value = optarg;
@@ -216,7 +216,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
@@ -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', },
+ { "bindpw", 1, NULL, 'w', },
{ NULL, 0, NULL, 0, },
};
@@ -73,7 +73,7 @@ static void
nsdb_update_nci_usage(const char *progname)
{
fprintf(stderr, "\n%s version " VERSION "\n", progname);
- fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w passwd ] "
+ fprintf(stderr, "Usage: %s [ -d ] [ -D binddn ] [ -w bindpw ] "
"[ -l nsdbname ] [ -r nsdbport ] "
"[ -e entry ] [-y]\n\n",
progname);
@@ -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, --bindpw Bind password\n");
fprintf(stderr, "\t-y, --delete Delete NSDB container info\n");
fprintf(stderr, "%s", fedfs_gpl_boilerplate);
@@ -102,7 +102,7 @@ nsdb_update_nci_usage(const char *progname)
int
main(int argc, char **argv)
{
- char *progname, *binddn, *passwd, *nsdbname, *nce;
+ char *progname, *binddn, *bindpw, *nsdbname, *nce;
unsigned short nsdbport;
unsigned int ldap_err;
FedFsStatus retval;
@@ -130,7 +130,7 @@ main(int argc, char **argv)
xlog_syslog(0);
xlog_open(progname);
- nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &passwd);
+ nsdb_env(&nsdbname, &nsdbport, &binddn, &nce, &bindpw);
if (nce == NULL)
nce = NSDB_DEFAULT_NCE;
@@ -158,7 +158,7 @@ main(int argc, char **argv)
}
break;
case 'w':
- passwd = optarg;
+ bindpw = optarg;
break;
case 'y':
delete = true;
@@ -196,7 +196,7 @@ main(int argc, char **argv)
if (binddn == NULL)
binddn = (char *)nsdb_default_binddn(host);
- retval = nsdb_open_nsdb(host, binddn, passwd, &ldap_err);
+ retval = nsdb_open_nsdb(host, binddn, bindpw, &ldap_err);
switch (retval) {
case FEDFS_OK:
break;
We're trying to keep the Solaris and Linux administrative interfaces roughly the same, to make it easy for admins to use either one without separate learning curves. Rob Thurlow pointed out that --bindpw, rather than --passwd, goes more intuitively with --binddn, so he'd prefer --bindpw. I've tried to model the short options for these commands after the LDAP command line tools, so we are keeping "-w"; but the LDAP tools don't appear to have long options. We are free to choose our own here. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- doc/man/nsdb-annotate.8 | 4 ++-- doc/man/nsdb-create-fsl.8 | 4 ++-- doc/man/nsdb-create-fsn.8 | 4 ++-- doc/man/nsdb-delete-fsl.8 | 4 ++-- doc/man/nsdb-delete-fsn.8 | 4 ++-- doc/man/nsdb-delete-nsdb.8 | 4 ++-- doc/man/nsdb-describe.8 | 4 ++-- doc/man/nsdb-remove-nci.8 | 4 ++-- doc/man/nsdb-resolve-fsn.8 | 2 +- doc/man/nsdb-update-fsl.8 | 4 ++-- doc/man/nsdb-update-nci.8 | 4 ++-- src/nsdbc/nsdb-annotate.c | 14 +++++++------- src/nsdbc/nsdb-create-fsl.c | 14 +++++++------- src/nsdbc/nsdb-create-fsn.c | 14 +++++++------- src/nsdbc/nsdb-delete-fsl.c | 14 +++++++------- src/nsdbc/nsdb-delete-fsn.c | 14 +++++++------- src/nsdbc/nsdb-delete-nsdb.c | 14 +++++++------- src/nsdbc/nsdb-describe.c | 14 +++++++------- src/nsdbc/nsdb-remove-nci.c | 14 +++++++------- src/nsdbc/nsdb-update-fsl.c | 14 +++++++------- src/nsdbc/nsdb-update-nci.c | 14 +++++++------- 21 files changed, 91 insertions(+), 91 deletions(-)