diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-12-15 11:12:24 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-12-15 11:12:24 +0100 |
| commit | e1b658a4ef4762b66c23f6fc1967f29c67e60257 (patch) | |
| tree | ae901757a2e3b5621f570858945a563e9a05bfc1 /src | |
| parent | cd390b7632c032adeead5926ccf484d204203133 (diff) | |
| download | gnutls-e1b658a4ef4762b66c23f6fc1967f29c67e60257.tar.gz | |
certtool --generate-request option conflicts with --infile. Suggested by Daniel Black.
Diffstat (limited to 'src')
| -rw-r--r-- | src/certtool-args.c | 9 | ||||
| -rw-r--r-- | src/certtool-args.def | 3 | ||||
| -rw-r--r-- | src/certtool-args.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/certtool-args.c b/src/certtool-args.c index b4b7f61b23..39b62c5ed5 100644 --- a/src/certtool-args.c +++ b/src/certtool-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (certtool-args.c) * - * It has been AutoGen-ed November 28, 2012 at 11:56:25 PM by AutoGen 5.16 + * It has been AutoGen-ed December 15, 2012 at 11:11:26 AM by AutoGen 5.16 * From the definitions certtool-args.def * and the template file options * @@ -356,11 +356,14 @@ static char const certtool_opt_strs[4794] = #define GENERATE_PRIVKEY_FLAGS (OPTST_DISABLED) /* - * generate-request option description: + * generate-request option description with + * "Must also have options" and "Incompatible options": */ #define GENERATE_REQUEST_DESC (certtool_opt_strs+1376) #define GENERATE_REQUEST_NAME (certtool_opt_strs+1416) #define GENERATE_REQUEST_name (certtool_opt_strs+1433) +static int const aGenerate_RequestCantList[] = { + INDEX_OPT_INFILE, NO_EQUIVALENT }; #define GENERATE_REQUEST_FLAGS (OPTST_DISABLED) /* @@ -926,7 +929,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* opt state flags */ GENERATE_REQUEST_FLAGS, 0, /* last opt argumnt */ { NULL }, /* --generate-request */ /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, + /* must/cannot opts */ NULL, aGenerate_RequestCantList, /* option proc */ NULL, /* desc, NAME, name */ GENERATE_REQUEST_DESC, GENERATE_REQUEST_NAME, GENERATE_REQUEST_name, /* disablement strs */ NULL, NULL }, diff --git a/src/certtool-args.def b/src/certtool-args.def index 511e055fc0..07e6406b8d 100644 --- a/src/certtool-args.def +++ b/src/certtool-args.def @@ -57,7 +57,8 @@ flag = { name = generate-request; value = q; descrip = "Generate a PKCS #10 certificate request"; - doc = ""; + flags_cant = infile; + doc = "Will generate a PKCS #10 certificate request. To specify a private key use --load-privkey."; }; flag = { diff --git a/src/certtool-args.h b/src/certtool-args.h index 68450bf6e4..bd1f67090c 100644 --- a/src/certtool-args.h +++ b/src/certtool-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (certtool-args.h) * - * It has been AutoGen-ed November 28, 2012 at 11:56:25 PM by AutoGen 5.16 + * It has been AutoGen-ed December 15, 2012 at 11:11:26 AM by AutoGen 5.16 * From the definitions certtool-args.def * and the template file options * |