options: Add SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY option.
Этот коммит содержится в:
родитель
503c729bb0
Коммит
095a01b70c
@ -332,7 +332,8 @@ enum ssh_options_e {
|
||||
SSH_OPTIONS_COMPRESSION_LEVEL,
|
||||
SSH_OPTIONS_KEY_EXCHANGE,
|
||||
SSH_OPTIONS_HOSTKEYS,
|
||||
SSH_OPTIONS_GSSAPI_SERVER_IDENTITY
|
||||
SSH_OPTIONS_GSSAPI_SERVER_IDENTITY,
|
||||
SSH_OPTIONS_GSSAPI_CLIENT_IDENTITY
|
||||
};
|
||||
|
||||
enum {
|
||||
|
@ -184,6 +184,7 @@ struct ssh_session_struct {
|
||||
int ssh1;
|
||||
char compressionlevel;
|
||||
char *gss_server_identity;
|
||||
char *gss_client_identity;
|
||||
} 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
|
||||
* 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
|
||||
* datatype which is used should be set according to the
|
||||
* type set.
|
||||
@ -810,6 +814,20 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
|
||||
}
|
||||
}
|
||||
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:
|
||||
ssh_set_error(session, SSH_REQUEST_DENIED, "Unknown ssh option %d", type);
|
||||
return -1;
|
||||
|
@ -266,6 +266,7 @@ void ssh_free(ssh_session session) {
|
||||
SAFE_FREE(session->opts.knownhosts);
|
||||
SAFE_FREE(session->opts.ProxyCommand);
|
||||
SAFE_FREE(session->opts.gss_server_identity);
|
||||
SAFE_FREE(session->opts.gss_client_identity);
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
if (session->opts.wanted_methods[i]) {
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user