RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2005/10/14 02:17:59 

[ssh-keygen.c ssh.c sshconnect2.c]
     no trailing "\n" for log functions; ok djm@
This commit is contained in:
Damien Miller 2005-11-05 15:07:33 +11:00
parent 6fd6defbce
commit 15d72a00a3
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -33,6 +33,9 @@
- stevesk@cvs.openbsd.org 2005/10/13 22:24:31 - stevesk@cvs.openbsd.org 2005/10/13 22:24:31
[auth2-gss.c gss-genr.c gss-serv.c monitor.c] [auth2-gss.c gss-genr.c gss-serv.c monitor.c]
KNF; ok djm@ KNF; ok djm@
- stevesk@cvs.openbsd.org 2005/10/14 02:17:59
[ssh-keygen.c ssh.c sshconnect2.c]
no trailing "\n" for log functions; ok djm@
20051102 20051102
- (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@ -3166,4 +3169,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3934 2005/11/05 04:07:05 djm Exp $ $Id: ChangeLog,v 1.3935 2005/11/05 04:07:33 djm Exp $

6
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.130 2005/10/07 11:13:57 markus Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.131 2005/10/14 02:17:59 stevesk Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -1222,7 +1222,7 @@ main(int ac, char **av)
if (bits == 0) if (bits == 0)
bits = DEFAULT_BITS; bits = DEFAULT_BITS;
if (gen_candidates(out, memory, bits, start) != 0) if (gen_candidates(out, memory, bits, start) != 0)
fatal("modulus candidate generation failed\n"); fatal("modulus candidate generation failed");
return (0); return (0);
} }
@ -1245,7 +1245,7 @@ main(int ac, char **av)
out_file, strerror(errno)); out_file, strerror(errno));
} }
if (prime_test(in, out, trials, generator_wanted) != 0) if (prime_test(in, out, trials, generator_wanted) != 0)
fatal("modulus screening failed\n"); fatal("modulus screening failed");
return (0); return (0);
} }

8
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.251 2005/09/19 15:42:44 jmc Exp $"); RCSID("$OpenBSD: ssh.c,v 1.252 2005/10/14 02:17:59 stevesk Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -1013,7 +1013,7 @@ ssh_control_listener(void)
fatal("ControlPath too long"); fatal("ControlPath too long");
if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
fatal("%s socket(): %s\n", __func__, strerror(errno)); fatal("%s socket(): %s", __func__, strerror(errno));
old_umask = umask(0177); old_umask = umask(0177);
if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
@ -1022,12 +1022,12 @@ ssh_control_listener(void)
fatal("ControlSocket %s already exists", fatal("ControlSocket %s already exists",
options.control_path); options.control_path);
else else
fatal("%s bind(): %s\n", __func__, strerror(errno)); fatal("%s bind(): %s", __func__, strerror(errno));
} }
umask(old_umask); umask(old_umask);
if (listen(control_fd, 64) == -1) if (listen(control_fd, 64) == -1)
fatal("%s listen(): %s\n", __func__, strerror(errno)); fatal("%s listen(): %s", __func__, strerror(errno));
set_nonblock(control_fd); set_nonblock(control_fd);
} }

4
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.142 2005/08/30 22:08:05 djm Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.143 2005/10/14 02:17:59 stevesk Exp $");
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"
@ -702,7 +702,7 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
packet_check_eom(); packet_check_eom();
debug("Server GSSAPI Error:\n%s\n", msg); debug("Server GSSAPI Error:\n%s", msg);
xfree(msg); xfree(msg);
xfree(lang); xfree(lang);
} }