From 0dc1bef12d30162ba09bfcc0b1cd6a5535ebdaab Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 17 Jul 2005 17:22:45 +1000 Subject: - djm@cvs.openbsd.org 2005/07/17 07:17:55 [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] [sshconnect.c sshconnect2.c] knf says that a 2nd level indent is four (not three or five) spaces --- serverloop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'serverloop.c') diff --git a/serverloop.c b/serverloop.c index eee1e7959..b0c4aafa0 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.117 2004/08/11 21:43:05 avsm Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.118 2005/07/17 07:17:55 djm Exp $"); #include "xmalloc.h" #include "packet.h" @@ -865,7 +865,7 @@ server_request_direct_tcpip(void) packet_check_eom(); debug("server_request_direct_tcpip: originator %s port %d, target %s port %d", - originator, originator_port, target, target_port); + originator, originator_port, target, target_port); /* XXX check permission */ sock = channel_connect_to(target, target_port); -- cgit v1.2.3 From b6f72f5294ee8ab476ba59a97e8509ef864c5072 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 17 Jul 2005 17:26:43 +1000 Subject: -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too --- ChangeLog | 4 +++- audit.c | 8 ++++---- auth1.c | 2 +- auth2.c | 2 +- entropy.c | 6 +++--- loginrec.c | 5 +++-- serverloop.c | 2 +- ssh-rand-helper.c | 6 +++--- 8 files changed, 19 insertions(+), 16 deletions(-) (limited to 'serverloop.c') diff --git a/ChangeLog b/ChangeLog index f1bf43095..346e87961 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,8 @@ [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] [sshconnect.c sshconnect2.c] knf says that a 2nd level indent is four (not three or five) spaces + -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] + [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too 20050716 - (dtucker) [auth-pam.c] Ensure that only one side of the authentication @@ -2855,4 +2857,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3851 2005/07/17 07:22:45 djm Exp $ +$Id: ChangeLog,v 1.3852 2005/07/17 07:26:43 djm Exp $ diff --git a/audit.c b/audit.c index 18fc41047..c77d0c012 100644 --- a/audit.c +++ b/audit.c @@ -1,4 +1,4 @@ -/* $Id: audit.c,v 1.2 2005/02/08 10:52:48 dtucker Exp $ */ +/* $Id: audit.c,v 1.3 2005/07/17 07:26:44 djm Exp $ */ /* * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved. @@ -120,7 +120,7 @@ void audit_connection_from(const char *host, int port) { debug("audit connection from %s port %d euid %d", host, port, - (int)geteuid()); + (int)geteuid()); } /* @@ -147,7 +147,7 @@ audit_session_open(const char *ttyn) const char *t = ttyn ? ttyn : "(no tty)"; debug("audit session open euid %d user %s tty name %s", geteuid(), - audit_username(), t); + audit_username(), t); } /* @@ -163,7 +163,7 @@ audit_session_close(const char *ttyn) const char *t = ttyn ? ttyn : "(no tty)"; debug("audit session close euid %d user %s tty name %s", geteuid(), - audit_username(), t); + audit_username(), t); } /* diff --git a/auth1.c b/auth1.c index 74e213d13..4bc2bf76d 100644 --- a/auth1.c +++ b/auth1.c @@ -323,7 +323,7 @@ do_authloop(Authctxt *authctxt) size_t len; error("Access denied for user %s by PAM account " - "configuration", authctxt->user); + "configuration", authctxt->user); len = buffer_len(&loginmsg); buffer_append(&loginmsg, "\0", 1); msg = buffer_ptr(&loginmsg); diff --git a/auth2.c b/auth2.c index 2265d311e..613b0e2bc 100644 --- a/auth2.c +++ b/auth2.c @@ -234,7 +234,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) packet_write_wait(); } fatal("Access denied for user %s by PAM account " - "configuration", authctxt->user); + "configuration", authctxt->user); } } #endif diff --git a/entropy.c b/entropy.c index 0997174b6..410bbb927 100644 --- a/entropy.c +++ b/entropy.c @@ -45,7 +45,7 @@ * XXX: we should tell the child how many bytes we need. */ -RCSID("$Id: entropy.c,v 1.48 2003/11/21 12:56:47 djm Exp $"); +RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $"); #ifndef OPENSSL_PRNG_ONLY #define RANDOM_SEED_SIZE 48 @@ -114,8 +114,8 @@ seed_rng(void) close(p[0]); if (waitpid(pid, &ret, 0) == -1) - fatal("Couldn't wait for ssh-rand-helper completion: %s", - strerror(errno)); + fatal("Couldn't wait for ssh-rand-helper completion: %s", + strerror(errno)); signal(SIGCHLD, old_sigchld); /* We don't mind if the child exits upon a SIGPIPE */ diff --git a/loginrec.c b/loginrec.c index 5d6e120c4..c3783c991 100644 --- a/loginrec.c +++ b/loginrec.c @@ -165,7 +165,7 @@ # include #endif -RCSID("$Id: loginrec.c,v 1.69 2005/07/17 07:04:47 djm Exp $"); +RCSID("$Id: loginrec.c,v 1.70 2005/07/17 07:26:44 djm Exp $"); /** ** prototypes for helper functions in this file @@ -444,7 +444,8 @@ login_write(struct logininfo *li) #endif #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN if (li->type == LTYPE_LOGIN && - !sys_auth_record_login(li->username,li->hostname,li->line, &loginmsg)) + !sys_auth_record_login(li->username,li->hostname,li->line, + &loginmsg)) logit("Writing login record failed for %s", li->username); #endif #ifdef SSH_AUDIT_EVENTS diff --git a/serverloop.c b/serverloop.c index b0c4aafa0..d2eff170a 100644 --- a/serverloop.c +++ b/serverloop.c @@ -983,7 +983,7 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) #ifndef NO_IPPORT_RESERVED_CONCEPT || (listen_port < IPPORT_RESERVED && pw->pw_uid != 0) #endif - ) { + ) { success = 0; packet_send_debug("Server has disabled port forwarding."); } else { diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index 5486a4632..87e52cf75 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c @@ -39,7 +39,7 @@ #include "pathnames.h" #include "log.h" -RCSID("$Id: ssh-rand-helper.c,v 1.25 2005/07/17 07:04:47 djm Exp $"); +RCSID("$Id: ssh-rand-helper.c,v 1.26 2005/07/17 07:26:44 djm Exp $"); /* Number of bytes we write out */ #define OUTPUT_SEED_SIZE 48 @@ -398,8 +398,8 @@ hash_command_output(entropy_cmd_t *src, unsigned char *hash) debug3("Time elapsed: %d msec", msec_elapsed); if (waitpid(pid, &status, 0) == -1) { - error("Couldn't wait for child '%s' completion: %s", - src->cmdstring, strerror(errno)); + error("Couldn't wait for child '%s' completion: %s", + src->cmdstring, strerror(errno)); return 0.0; } -- cgit v1.2.3