1
1

options: Add SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY option.

Этот коммит содержится в:
Andreas Schneider 2013-11-15 15:48:19 +01:00
родитель 503c729bb0
Коммит 095a01b70c
4 изменённых файлов: 22 добавлений и 1 удалений

Просмотреть файл

@ -332,7 +332,8 @@ enum ssh_options_e {
SSH_OPTIONS_COMPRESSION_LEVEL, SSH_OPTIONS_COMPRESSION_LEVEL,
SSH_OPTIONS_KEY_EXCHANGE, SSH_OPTIONS_KEY_EXCHANGE,
SSH_OPTIONS_HOSTKEYS, SSH_OPTIONS_HOSTKEYS,
SSH_OPTIONS_GSSAPI_SERVER_IDENTITY SSH_OPTIONS_GSSAPI_SERVER_IDENTITY,
SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY
}; };
enum { enum {

Просмотреть файл

@ -184,6 +184,7 @@ struct ssh_session_struct {
int ssh1; int ssh1;
char compressionlevel; char compressionlevel;
char *gss_server_identity; char *gss_server_identity;
char *gss_client_identity;
} opts; } opts;
}; };

Просмотреть файл

@ -371,6 +371,10 @@ int ssh_options_set_algo(ssh_session session, int algo,
* Set it to specify the GSSAPI server identity that libssh * Set it to specify the GSSAPI server identity that libssh
* should expect when connecting to the server (const char *). * should expect when connecting to the server (const char *).
* *
* - SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY
* Set it to specify the GSSAPI client identity that libssh
* should expect when connecting to the server (const char *).
*
* @param value The value to set. This is a generic pointer and the * @param value The value to set. This is a generic pointer and the
* datatype which is used should be set according to the * datatype which is used should be set according to the
* type set. * type set.
@ -810,6 +814,20 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
} }
} }
break; break;
case SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY:
v = value;
if (v == NULL || v[0] == '\0') {
ssh_set_error_invalid(session);
return -1;
} else {
SAFE_FREE(session->opts.gss_client_identity);
session->opts.gss_client_identity = strdup(v);
if (session->opts.gss_client_identity == NULL) {
ssh_set_error_oom(session);
return -1;
}
}
break;
default: default:
ssh_set_error(session, SSH_REQUEST_DENIED, "Unknown ssh option %d", type); ssh_set_error(session, SSH_REQUEST_DENIED, "Unknown ssh option %d", type);
return -1; return -1;

Просмотреть файл

@ -266,6 +266,7 @@ void ssh_free(ssh_session session) {
SAFE_FREE(session->opts.knownhosts); SAFE_FREE(session->opts.knownhosts);
SAFE_FREE(session->opts.ProxyCommand); SAFE_FREE(session->opts.ProxyCommand);
SAFE_FREE(session->opts.gss_server_identity); SAFE_FREE(session->opts.gss_server_identity);
SAFE_FREE(session->opts.gss_client_identity);
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
if (session->opts.wanted_methods[i]) { if (session->opts.wanted_methods[i]) {