63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
From bf0fc39a800136fc25c4dca488c6058178bd74ab Mon Sep 17 00:00:00 2001
|
|
From: Alexander Scheel <ascheel@redhat.com>
|
|
Date: Tue, 18 Feb 2020 15:59:12 -0500
|
|
Subject: [PATCH] Remove sslget -V option
|
|
|
|
Since we haven't used SVN in a while, $Revision$ and $Date$
|
|
no longer update. Remove the -V option instead of passing in
|
|
a valid version number.
|
|
|
|
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
|
|
---
|
|
base/native-tools/src/sslget/sslget.c | 21 ++++++---------------
|
|
1 file changed, 6 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/base/native-tools/src/sslget/sslget.c b/base/native-tools/src/sslget/sslget.c
|
|
index 4f3ebc4500..f115b21347 100644
|
|
--- a/base/native-tools/src/sslget/sslget.c
|
|
+++ b/base/native-tools/src/sslget/sslget.c
|
|
@@ -96,8 +96,6 @@ int getopt(int ac, char * const av[], const char * opts);
|
|
#endif /* XP_PC */
|
|
/*end secopt.h*/
|
|
|
|
-#define VERSIONSTRING "$Revision$ ($Date$)"
|
|
-
|
|
#ifndef PORT_Sprintf
|
|
#define PORT_Sprintf sprintf
|
|
#endif
|
|
@@ -140,12 +138,11 @@ static void
|
|
Usage(const char *progName)
|
|
{
|
|
fprintf(stderr,
|
|
- "Usage: %s [-n nickname] [-p password | -w pwfile ] [-d dbdir] \n"
|
|
- " [-e post] [-v] [-V] -r url hostname[:port]\n"
|
|
- " -n : nickname or hsm:nickname\n"
|
|
- " -v : verbose\n"
|
|
- " -V : report version information\n",
|
|
- progName);
|
|
+ "Usage: %s [-n nickname] [-p password | -w pwfile ] [-d dbdir] \n"
|
|
+ " [-e post] [-v] -r url hostname[:port]\n"
|
|
+ " -n : nickname or hsm:nickname\n"
|
|
+ " -v : verbose\n",
|
|
+ progName);
|
|
exit(1);
|
|
}
|
|
|
|
@@ -823,15 +820,9 @@ main(int argc, char **argv)
|
|
progName = progName ? progName + 1 : tmp;
|
|
|
|
|
|
- while ((optchar = getopt(argc, argv, "Vd:e:n:p:r:w:v")) != -1) {
|
|
+ while ((optchar = getopt(argc, argv, "d:e:n:p:r:w:v")) != -1) {
|
|
switch(optchar) {
|
|
|
|
-/* Version */
|
|
- case 'V':
|
|
- printf("%s\n",VERSIONSTRING);
|
|
- PR_Cleanup();
|
|
- return 0;
|
|
-
|
|
/* Directory which holds NSS database */
|
|
case 'd':
|
|
dir = optarg;
|