Commit 9bfe742d authored by Niels Möller's avatar Niels Möller
Browse files

(SERVER_PROTOCOL_VERSION): Deleted constant.

(CLIENT_PROTOCOL_VERSION): Likewise.
(SERVER_VERSION_LINE): New constant.
(CLIENT_VERSION_LINE): Likewise.
Updated all users.

Rev: src/lsh-transport.c:1.15
Rev: src/lsh.c:1.220
Rev: src/lshd-connection.c:1.11
Rev: src/lshd-userauth.c:1.13
Rev: src/version.h:1.14
parent 58159634
...@@ -788,7 +788,7 @@ lsh_connect(struct lsh_transport_config *config) ...@@ -788,7 +788,7 @@ lsh_connect(struct lsh_transport_config *config)
gc_global(&connection->super.super.super); gc_global(&connection->super.super.super);
transport_handshake(&connection->super.super, transport_handshake(&connection->super.super,
make_string("SSH-2.0-lsh-transport"), make_string(CLIENT_VERSION_LINE),
lsh_transport_line_handler); lsh_transport_line_handler);
return 1; return 1;
...@@ -1153,7 +1153,7 @@ read_host_acls(struct lsh_transport_lookup_verifier *self) ...@@ -1153,7 +1153,7 @@ read_host_acls(struct lsh_transport_lookup_verifier *self)
/* Option parsing */ /* Option parsing */
const char *argp_program_version const char *argp_program_version
= "lsh-transport (" PACKAGE_STRING "), secsh protocol version " CLIENT_PROTOCOL_VERSION; = "lsh-transport (" PACKAGE_STRING ")";
const char *argp_program_bug_address = BUG_ADDRESS; const char *argp_program_bug_address = BUG_ADDRESS;
......
...@@ -448,8 +448,7 @@ client_command_session(struct lsh_options *options, ...@@ -448,8 +448,7 @@ client_command_session(struct lsh_options *options,
/* Option parsing */ /* Option parsing */
const char *argp_program_version const char *argp_program_version = "lsh (" PACKAGE_STRING ")";
= "lsh (" PACKAGE_STRING "), secsh protocol version " CLIENT_PROTOCOL_VERSION;
const char *argp_program_bug_address = BUG_ADDRESS; const char *argp_program_bug_address = BUG_ADDRESS;
......
...@@ -290,7 +290,7 @@ make_lshd_connection(struct lshd_connection_config *config) ...@@ -290,7 +290,7 @@ make_lshd_connection(struct lshd_connection_config *config)
/* Option parsing */ /* Option parsing */
const char *argp_program_version const char *argp_program_version
= "lshd-connection (" PACKAGE_STRING "), secsh protocol version " SERVER_PROTOCOL_VERSION; = "lshd-connection (" PACKAGE_STRING ")";
static struct lshd_connection_config * static struct lshd_connection_config *
make_lshd_connection_config(void) make_lshd_connection_config(void)
......
...@@ -649,7 +649,7 @@ enum { ...@@ -649,7 +649,7 @@ enum {
}; };
const char *argp_program_version const char *argp_program_version
= "lshd-userauth (" PACKAGE_STRING "), secsh protocol version " SERVER_PROTOCOL_VERSION; = "lshd-userauth (" PACKAGE_STRING ")";
const char *argp_program_bug_address = BUG_ADDRESS; const char *argp_program_bug_address = BUG_ADDRESS;
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#ifndef LSH_VERSION_H_INCLUDED #ifndef LSH_VERSION_H_INCLUDED
#define LSH_VERSION_H_INCLUDED #define LSH_VERSION_H_INCLUDED
#define CLIENT_PROTOCOL_VERSION "2.0" #define SOFTWARE_SLOGAN "a GNU ssh"
#define SERVER_PROTOCOL_VERSION "2.0"
#define SOFTWARE_SLOGAN "lsh - a GNU ssh" #define SERVER_VERSION_LINE ("SSH-2.0-lshd-" PACKAGE_VERSION " " SOFTWARE_SLOGAN)
#define CLIENT_VERSION_LINE ("SSH-2.0-lsh-transport-" PACKAGE_VERSION " " SOFTWARE_SLOGAN)
#define BUG_ADDRESS "<bug-lsh@gnu.org>" #define BUG_ADDRESS "<bug-lsh@gnu.org>"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment