diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-10 23:50:09 +0100 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-10 23:50:09 +0100 |
| commit | 4f7a64a64fb5de0f9642074915dd39bd7167fbd4 (patch) | |
| tree | c8052021f7d94530bc8ed5409bc68b52b3c71b4e /readconf.c | |
| parent | - markus@cvs.openbsd.org 2001/02/06 22:43:02 (diff) | |
| download | openssh-4f7a64a64fb5de0f9642074915dd39bd7167fbd4.tar.xz openssh-4f7a64a64fb5de0f9642074915dd39bd7167fbd4.zip | |
- deraadt@cvs.openbsd.org 2001/02/08 14:39:36
[readconf.c]
snprintf
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/readconf.c b/readconf.c index e3a1dd742..f62905c29 100644 --- a/readconf.c +++ b/readconf.c @@ -12,7 +12,7 @@ */ #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 "xmalloc.h" @@ -717,6 +717,8 @@ initialize_options(Options * options) void fill_default_options(Options * options) { + int len; + if (options->forward_agent == -1) options->forward_agent = 0; 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; if (options->num_identity_files == 0) { if (options->protocol & SSH_PROTO_1) { + len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; options->identity_files[options->num_identity_files] = - xmalloc(2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1); - sprintf(options->identity_files[options->num_identity_files++], - "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); + xmalloc(len); + snprintf(options->identity_files[options->num_identity_files++], + len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); } if (options->protocol & SSH_PROTO_2) { + len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1; options->identity_files[options->num_identity_files] = - xmalloc(2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1); - sprintf(options->identity_files[options->num_identity_files++], - "~/%.100s", _PATH_SSH_CLIENT_ID_DSA); + xmalloc(len); + snprintf(options->identity_files[options->num_identity_files++], + len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA); } } if (options->escape_char == -1) |