diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-07-19 22:16:28 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-17 22:01:43 +0200 |
| commit | 0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf (patch) | |
| tree | f15352f0ddd948e9e9ba1ed1c5103d3333220bef /src/options.c | |
| parent | 3799670d01f4faa68b6ab8055250bc042d707b29 (diff) | |
| download | libssh-0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf.tar.gz libssh-0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf.tar.xz libssh-0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf.zip | |
Fixes the ssh_log issue on ssh_bind handles.
(cherry picked from commit da954c2c5ee85bcbe2f5ad9f507a6306b0f5f8b9)
Conflicts:
src/keyfiles.c
Diffstat (limited to 'src/options.c')
| -rw-r--r-- | src/options.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/options.c b/src/options.c index 5a9c5bf5..2233ac0a 100644 --- a/src/options.c +++ b/src/options.c @@ -139,12 +139,12 @@ int ssh_options_copy(ssh_session src, ssh_session *dest) { } new->fd = src->fd; new->port = src->port; - new->callbacks = src->callbacks; + new->common.callbacks = src->common.callbacks; new->timeout = src->timeout; new->timeout_usec = src->timeout_usec; new->ssh2 = src->ssh2; new->ssh1 = src->ssh1; - new->log_verbosity = src->log_verbosity; + new->common.log_verbosity = src->common.log_verbosity; new->compressionlevel = src->compressionlevel; return 0; @@ -544,12 +544,12 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type, } else { int *x = (int *) value; - session->log_verbosity = *x & 0xffff; + session->common.log_verbosity = *x & 0xffff; } break; case SSH_OPTIONS_LOG_VERBOSITY_STR: if (value == NULL) { - session->log_verbosity = 0 & 0xffff; + session->common.log_verbosity = 0 & 0xffff; } else { q = strdup(value); if (q == NULL) { @@ -562,7 +562,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type, } SAFE_FREE(q); - session->log_verbosity = i & 0xffff; + session->common.log_verbosity = i & 0xffff; } break; case SSH_OPTIONS_CIPHERS_C_S: @@ -1106,12 +1106,12 @@ int ssh_bind_options_set(ssh_bind sshbind, enum ssh_bind_options_e type, return -1; } else { int *x = (int *) value; - sshbind->log_verbosity = *x & 0xffff; + sshbind->common.log_verbosity = *x & 0xffff; } break; case SSH_BIND_OPTIONS_LOG_VERBOSITY_STR: if (value == NULL) { - sshbind->log_verbosity = 0; + sshbind->common.log_verbosity = 0; } else { q = strdup(value); if (q == NULL) { @@ -1124,7 +1124,7 @@ int ssh_bind_options_set(ssh_bind sshbind, enum ssh_bind_options_e type, } SAFE_FREE(q); - sshbind->log_verbosity = i & 0xffff; + sshbind->common.log_verbosity = i & 0xffff; } break; case SSH_BIND_OPTIONS_DSAKEY: |