tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/02/08 14:39:36 

[readconf.c]
     snprintf
This commit is contained in:
Ben Lindstrom 2001-02-10 22:50:09 +00:00
parent 9d3a859e8c
commit 4f7a64a64f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -55,6 +55,9 @@
- markus@cvs.openbsd.org 2001/02/06 22:43:02 - markus@cvs.openbsd.org 2001/02/06 22:43:02
[clientloop.h] [clientloop.h]
remove confusing callback code remove confusing callback code
- deraadt@cvs.openbsd.org 2001/02/08 14:39:36
[readconf.c]
snprintf
- (bal) fixed sftp-client.c. Return 'status' instead of '0' - (bal) fixed sftp-client.c. Return 'status' instead of '0'
(from the OpenBSD tree) (from the OpenBSD tree)
- (bal) Synced ssh.1 and sshd.8 w/ OpenBSD - (bal) Synced ssh.1 and sshd.8 w/ OpenBSD
@ -3841,4 +3844,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.727 2001/02/10 22:44:12 mouring Exp $ $Id: ChangeLog,v 1.728 2001/02/10 22:50:09 mouring Exp $

18
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.60 2001/01/28 20:36:16 stevesk Exp $"); RCSID("$OpenBSD: readconf.c,v 1.61 2001/02/08 14:39:36 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -717,6 +717,8 @@ initialize_options(Options * options)
void void
fill_default_options(Options * options) fill_default_options(Options * options)
{ {
int len;
if (options->forward_agent == -1) if (options->forward_agent == -1)
options->forward_agent = 0; options->forward_agent = 0;
if (options->forward_x11 == -1) if (options->forward_x11 == -1)
@ -783,16 +785,18 @@ fill_default_options(Options * options)
options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
if (options->num_identity_files == 0) { if (options->num_identity_files == 0) {
if (options->protocol & SSH_PROTO_1) { if (options->protocol & SSH_PROTO_1) {
len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;
options->identity_files[options->num_identity_files] = options->identity_files[options->num_identity_files] =
xmalloc(2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1); xmalloc(len);
sprintf(options->identity_files[options->num_identity_files++], snprintf(options->identity_files[options->num_identity_files++],
"~/%.100s", _PATH_SSH_CLIENT_IDENTITY); len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
} }
if (options->protocol & SSH_PROTO_2) { if (options->protocol & SSH_PROTO_2) {
len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
options->identity_files[options->num_identity_files] = options->identity_files[options->num_identity_files] =
xmalloc(2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1); xmalloc(len);
sprintf(options->identity_files[options->num_identity_files++], snprintf(options->identity_files[options->num_identity_files++],
"~/%.100s", _PATH_SSH_CLIENT_ID_DSA); len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
} }
} }
if (options->escape_char == -1) if (options->escape_char == -1)