diff options
author | Damien Miller <djm@mindrot.org> | 2005-07-17 17:26:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-07-17 17:26:43 +1000 |
commit | b6f72f5294ee8ab476ba59a97e8509ef864c5072 (patch) | |
tree | 633ab5ed082660231bb0e235e12f4900445dd6ba | |
parent | 0dc1bef12d30162ba09bfcc0b1cd6a5535ebdaab (diff) |
-(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
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | audit.c | 8 | ||||
-rw-r--r-- | auth1.c | 2 | ||||
-rw-r--r-- | auth2.c | 2 | ||||
-rw-r--r-- | entropy.c | 6 | ||||
-rw-r--r-- | loginrec.c | 5 | ||||
-rw-r--r-- | serverloop.c | 2 | ||||
-rw-r--r-- | ssh-rand-helper.c | 6 |
8 files changed, 19 insertions, 16 deletions
@@ -22,6 +22,8 @@ | |||
22 | [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] | 22 | [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] |
23 | [sshconnect.c sshconnect2.c] | 23 | [sshconnect.c sshconnect2.c] |
24 | knf says that a 2nd level indent is four (not three or five) spaces | 24 | knf says that a 2nd level indent is four (not three or five) spaces |
25 | -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] | ||
26 | [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too | ||
25 | 27 | ||
26 | 20050716 | 28 | 20050716 |
27 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication | 29 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication |
@@ -2855,4 +2857,4 @@ | |||
2855 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2857 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2856 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2858 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2857 | 2859 | ||
2858 | $Id: ChangeLog,v 1.3851 2005/07/17 07:22:45 djm Exp $ | 2860 | $Id: ChangeLog,v 1.3852 2005/07/17 07:26:43 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: audit.c,v 1.2 2005/02/08 10:52:48 dtucker Exp $ */ | 1 | /* $Id: audit.c,v 1.3 2005/07/17 07:26:44 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved. | 4 | * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved. |
@@ -120,7 +120,7 @@ void | |||
120 | audit_connection_from(const char *host, int port) | 120 | audit_connection_from(const char *host, int port) |
121 | { | 121 | { |
122 | debug("audit connection from %s port %d euid %d", host, port, | 122 | debug("audit connection from %s port %d euid %d", host, port, |
123 | (int)geteuid()); | 123 | (int)geteuid()); |
124 | } | 124 | } |
125 | 125 | ||
126 | /* | 126 | /* |
@@ -147,7 +147,7 @@ audit_session_open(const char *ttyn) | |||
147 | const char *t = ttyn ? ttyn : "(no tty)"; | 147 | const char *t = ttyn ? ttyn : "(no tty)"; |
148 | 148 | ||
149 | debug("audit session open euid %d user %s tty name %s", geteuid(), | 149 | debug("audit session open euid %d user %s tty name %s", geteuid(), |
150 | audit_username(), t); | 150 | audit_username(), t); |
151 | } | 151 | } |
152 | 152 | ||
153 | /* | 153 | /* |
@@ -163,7 +163,7 @@ audit_session_close(const char *ttyn) | |||
163 | const char *t = ttyn ? ttyn : "(no tty)"; | 163 | const char *t = ttyn ? ttyn : "(no tty)"; |
164 | 164 | ||
165 | debug("audit session close euid %d user %s tty name %s", geteuid(), | 165 | debug("audit session close euid %d user %s tty name %s", geteuid(), |
166 | audit_username(), t); | 166 | audit_username(), t); |
167 | } | 167 | } |
168 | 168 | ||
169 | /* | 169 | /* |
@@ -323,7 +323,7 @@ do_authloop(Authctxt *authctxt) | |||
323 | size_t len; | 323 | size_t len; |
324 | 324 | ||
325 | error("Access denied for user %s by PAM account " | 325 | error("Access denied for user %s by PAM account " |
326 | "configuration", authctxt->user); | 326 | "configuration", authctxt->user); |
327 | len = buffer_len(&loginmsg); | 327 | len = buffer_len(&loginmsg); |
328 | buffer_append(&loginmsg, "\0", 1); | 328 | buffer_append(&loginmsg, "\0", 1); |
329 | msg = buffer_ptr(&loginmsg); | 329 | msg = buffer_ptr(&loginmsg); |
@@ -234,7 +234,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) | |||
234 | packet_write_wait(); | 234 | packet_write_wait(); |
235 | } | 235 | } |
236 | fatal("Access denied for user %s by PAM account " | 236 | fatal("Access denied for user %s by PAM account " |
237 | "configuration", authctxt->user); | 237 | "configuration", authctxt->user); |
238 | } | 238 | } |
239 | } | 239 | } |
240 | #endif | 240 | #endif |
@@ -45,7 +45,7 @@ | |||
45 | * XXX: we should tell the child how many bytes we need. | 45 | * XXX: we should tell the child how many bytes we need. |
46 | */ | 46 | */ |
47 | 47 | ||
48 | RCSID("$Id: entropy.c,v 1.48 2003/11/21 12:56:47 djm Exp $"); | 48 | RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $"); |
49 | 49 | ||
50 | #ifndef OPENSSL_PRNG_ONLY | 50 | #ifndef OPENSSL_PRNG_ONLY |
51 | #define RANDOM_SEED_SIZE 48 | 51 | #define RANDOM_SEED_SIZE 48 |
@@ -114,8 +114,8 @@ seed_rng(void) | |||
114 | close(p[0]); | 114 | close(p[0]); |
115 | 115 | ||
116 | if (waitpid(pid, &ret, 0) == -1) | 116 | if (waitpid(pid, &ret, 0) == -1) |
117 | fatal("Couldn't wait for ssh-rand-helper completion: %s", | 117 | fatal("Couldn't wait for ssh-rand-helper completion: %s", |
118 | strerror(errno)); | 118 | strerror(errno)); |
119 | signal(SIGCHLD, old_sigchld); | 119 | signal(SIGCHLD, old_sigchld); |
120 | 120 | ||
121 | /* We don't mind if the child exits upon a SIGPIPE */ | 121 | /* 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 @@ | |||
165 | # include <libutil.h> | 165 | # include <libutil.h> |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | RCSID("$Id: loginrec.c,v 1.69 2005/07/17 07:04:47 djm Exp $"); | 168 | RCSID("$Id: loginrec.c,v 1.70 2005/07/17 07:26:44 djm Exp $"); |
169 | 169 | ||
170 | /** | 170 | /** |
171 | ** prototypes for helper functions in this file | 171 | ** prototypes for helper functions in this file |
@@ -444,7 +444,8 @@ login_write(struct logininfo *li) | |||
444 | #endif | 444 | #endif |
445 | #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN | 445 | #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN |
446 | if (li->type == LTYPE_LOGIN && | 446 | if (li->type == LTYPE_LOGIN && |
447 | !sys_auth_record_login(li->username,li->hostname,li->line, &loginmsg)) | 447 | !sys_auth_record_login(li->username,li->hostname,li->line, |
448 | &loginmsg)) | ||
448 | logit("Writing login record failed for %s", li->username); | 449 | logit("Writing login record failed for %s", li->username); |
449 | #endif | 450 | #endif |
450 | #ifdef SSH_AUDIT_EVENTS | 451 | #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) | |||
983 | #ifndef NO_IPPORT_RESERVED_CONCEPT | 983 | #ifndef NO_IPPORT_RESERVED_CONCEPT |
984 | || (listen_port < IPPORT_RESERVED && pw->pw_uid != 0) | 984 | || (listen_port < IPPORT_RESERVED && pw->pw_uid != 0) |
985 | #endif | 985 | #endif |
986 | ) { | 986 | ) { |
987 | success = 0; | 987 | success = 0; |
988 | packet_send_debug("Server has disabled port forwarding."); | 988 | packet_send_debug("Server has disabled port forwarding."); |
989 | } else { | 989 | } 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 @@ | |||
39 | #include "pathnames.h" | 39 | #include "pathnames.h" |
40 | #include "log.h" | 40 | #include "log.h" |
41 | 41 | ||
42 | RCSID("$Id: ssh-rand-helper.c,v 1.25 2005/07/17 07:04:47 djm Exp $"); | 42 | RCSID("$Id: ssh-rand-helper.c,v 1.26 2005/07/17 07:26:44 djm Exp $"); |
43 | 43 | ||
44 | /* Number of bytes we write out */ | 44 | /* Number of bytes we write out */ |
45 | #define OUTPUT_SEED_SIZE 48 | 45 | #define OUTPUT_SEED_SIZE 48 |
@@ -398,8 +398,8 @@ hash_command_output(entropy_cmd_t *src, unsigned char *hash) | |||
398 | debug3("Time elapsed: %d msec", msec_elapsed); | 398 | debug3("Time elapsed: %d msec", msec_elapsed); |
399 | 399 | ||
400 | if (waitpid(pid, &status, 0) == -1) { | 400 | if (waitpid(pid, &status, 0) == -1) { |
401 | error("Couldn't wait for child '%s' completion: %s", | 401 | error("Couldn't wait for child '%s' completion: %s", |
402 | src->cmdstring, strerror(errno)); | 402 | src->cmdstring, strerror(errno)); |
403 | return 0.0; | 403 | return 0.0; |
404 | } | 404 | } |
405 | 405 | ||