diff options
| author | unknown <jani@hynda.mysql.fi> | 2002-04-02 20:29:53 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2002-04-02 20:29:53 +0300 |
| commit | a2e75474b51e41446af02081ba2917f0f296aee2 (patch) | |
| tree | 1646f32146d233c71f082b8d74b469e6a1c1e70f /include/sslopt-longopts.h | |
| parent | 90a76d688ab49832f51462dbc906b4c11b4a09fb (diff) | |
| download | mariadb-git-a2e75474b51e41446af02081ba2917f0f296aee2.tar.gz | |
Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport,
mysqlcheck and myisamchk to use new my_getopt struct.
client/client_priv.h:
Changes for my_getopt
client/mysql.cc:
Uses new my_getopt
client/mysqladmin.c:
Uses new my_getopt
client/mysqlcheck.c:
Uses new my_getopt
client/mysqldump.c:
Uses new my_getopt
client/mysqlimport.c:
Uses new my_getopt
client/mysqlshow.c:
Uses new my_getopt
include/my_getopt.h:
Added GET_BOOL type
include/sslopt-case.h:
This is shouldn't be needed anymore.
include/sslopt-longopts.h:
Uses new my_getopt
myisam/myisamchk.c:
Uses new my_getopt
mysys/my_getopt.c:
Some bug fixes and small feature adds to my_getopt
sql/mysqld.cc:
mysqld.cc will be changed next. sslopt-* had to be removed
temporarily.
Diffstat (limited to 'include/sslopt-longopts.h')
| -rw-r--r-- | include/sslopt-longopts.h | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h index 2a0f27f3235..d82c833c439 100644 --- a/include/sslopt-longopts.h +++ b/include/sslopt-longopts.h @@ -16,17 +16,26 @@ #ifdef HAVE_OPENSSL -#define OPT_SSL_SSL 200 -#define OPT_SSL_KEY 201 -#define OPT_SSL_CERT 202 -#define OPT_SSL_CA 203 -#define OPT_SSL_CAPATH 204 -#define OPT_SSL_CIPHER 205 - {"ssl", no_argument, 0, OPT_SSL_SSL}, - {"ssl-key", required_argument, 0, OPT_SSL_KEY}, - {"ssl-cert", required_argument, 0, OPT_SSL_CERT}, - {"ssl-ca", required_argument, 0, OPT_SSL_CA}, - {"ssl-capath", required_argument, 0, OPT_SSL_CAPATH}, - {"ssl-cipher", required_argument, 0, OPT_SSL_CIPHER}, + {"ssl", OPT_SSL_SSL, + "Use SSL for connection (automatically set with other flags)", + (gptr*) &opt_use_ssl, (gptr*) &opt_use_ssl, 0, GET_BOOL, NO_ARG, 0, 0, 0, + 0, 0, 0}, + {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl)", + (gptr*) &opt_ssl_key, (gptr*) &opt_ssl_key, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, + {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl)", + (gptr*) &opt_ssl_cert, (gptr*) &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, + {"ssl-ca", OPT_SSL_CA, + "CA file in PEM format (check OpenSSL docs, implies --ssl)", + (gptr*) &opt_ssl_ca, (gptr*) &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, + {"ssl-capath", OPT_SSL_CAPATH, + "CA directory (check OpenSSL docs, implies --ssl)", + (gptr*) &opt_ssl_capath, (gptr*) &opt_ssl_capath, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, + {"ssl-cipher", OPT_SSL_CAPATH, "SSL cipher to use (implies --ssl)", + (gptr*) &opt_ssl_cipher, (gptr*) &opt_ssl_cipher, 0, GET_STR, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, #endif /* HAVE_OPENSSL */ |