summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-02-24 11:41:34 -0500
committerRob Crittenden <rcritten@redhat.com>2010-03-02 18:20:13 -0500
commitd6a79f9cd826e26b453aa73c82a3eec510e5df75 (patch)
treeb99832c21a5d5f524c18e43be7ef6ad29ad06406
parent889cf124d8cba470dadf2ca88bcbb07d13bc928b (diff)
downloadfreeipa-d6a79f9cd826e26b453aa73c82a3eec510e5df75.tar.gz
freeipa-d6a79f9cd826e26b453aa73c82a3eec510e5df75.tar.xz
freeipa-d6a79f9cd826e26b453aa73c82a3eec510e5df75.zip
Add the popt auto-help/usage macro for enhanced help output.
-rw-r--r--ipa-client/ipa-getkeytab.c3
-rw-r--r--ipa-client/ipa-join.c3
-rw-r--r--ipa-client/ipa-rmkeytab.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/ipa-client/ipa-getkeytab.c b/ipa-client/ipa-getkeytab.c
index 1bbb7759e..d55355aab 100644
--- a/ipa-client/ipa-getkeytab.c
+++ b/ipa-client/ipa-getkeytab.c
@@ -724,7 +724,8 @@ int main(int argc, char *argv[])
{ "password", 'P', POPT_ARG_NONE, &askpass, 0, "Asks for a non-random password to use for the principal" },
{ "binddn", 'D', POPT_ARG_STRING, &binddn, 0, "LDAP DN", "DN to bind as if not using kerberos" },
{ "bindpw", 'w', POPT_ARG_STRING, &bindpw, 0, "LDAP password", "password to use if not using kerberos" },
- { NULL, 0, POPT_ARG_NONE, NULL, 0, NULL, NULL }
+ POPT_AUTOHELP
+ POPT_TABLEEND
};
poptContext pc;
char *ktname;
diff --git a/ipa-client/ipa-join.c b/ipa-client/ipa-join.c
index 7cc03157f..5b1f0a606 100644
--- a/ipa-client/ipa-join.c
+++ b/ipa-client/ipa-join.c
@@ -663,7 +663,8 @@ main(int argc, char **argv) {
{ "server", 's', POPT_ARG_STRING, &server, 0, "IPA Server to use", "IPA Server Name" },
{ "keytab", 'k', POPT_ARG_STRING, &keytab, 0, "File were to store the keytab information", "Keytab File Name" },
{ "bindpw", 'w', POPT_ARG_STRING, &bindpw, 0, "LDAP password", "password to use if not using kerberos" },
- { NULL, 0, POPT_ARG_NONE, NULL, 0, NULL, NULL }
+ POPT_AUTOHELP
+ POPT_TABLEEND
};
poptContext pc;
int ret;
diff --git a/ipa-client/ipa-rmkeytab.c b/ipa-client/ipa-rmkeytab.c
index 867473bc2..043379873 100644
--- a/ipa-client/ipa-rmkeytab.c
+++ b/ipa-client/ipa-rmkeytab.c
@@ -153,7 +153,8 @@ main(int argc, char **argv)
{ "principal", 'p', POPT_ARG_STRING, &principal, 0, "The principal to get a keytab for (ex: ftp/ftp.example.com@EXAMPLE.COM)", "Kerberos Service Principal Name" },
{ "keytab", 'k', POPT_ARG_STRING, &keytab, 0, "File were to store the keytab information", "Keytab File Name" },
{ "realm", 'r', POPT_ARG_STRING, &realm, 0, "Remove all principals in this realm", "Realm name" },
-{ NULL, 0, POPT_ARG_NONE, NULL, 0, NULL, NULL }
+ POPT_AUTOHELP
+ POPT_TABLEEND
};
memset(&ktid, 0, sizeof(ktid));