diff options
-rw-r--r-- | auth-krb5.c | 2 | ||||
-rw-r--r-- | channels.c | 8 | ||||
-rw-r--r-- | clientloop.c | 2 | ||||
-rw-r--r-- | entropy.c | 4 | ||||
-rw-r--r-- | nchan.c | 4 | ||||
-rw-r--r-- | session.c | 2 | ||||
-rw-r--r-- | sftp-client.c | 2 | ||||
-rw-r--r-- | sftp.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 2 | ||||
-rw-r--r-- | ssh-keygen.c | 2 | ||||
-rw-r--r-- | ssh-keysign.c | 6 | ||||
-rw-r--r-- | ssh-rand-helper.c | 4 | ||||
-rw-r--r-- | sshconnect.h | 6 | ||||
-rw-r--r-- | sshpty.c | 6 |
14 files changed, 27 insertions, 27 deletions
diff --git a/auth-krb5.c b/auth-krb5.c index 76c2419aa..308a6d5f9 100644 --- a/auth-krb5.c +++ b/auth-krb5.c | |||
@@ -323,7 +323,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password) | |||
323 | 323 | ||
324 | if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user, | 324 | if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user, |
325 | authctxt->pw->pw_name)) { | 325 | authctxt->pw->pw_name)) { |
326 | problem = -1; | 326 | problem = -1; |
327 | goto out; | 327 | goto out; |
328 | } | 328 | } |
329 | 329 | ||
diff --git a/channels.c b/channels.c index 3ac690135..cca138c2b 100644 --- a/channels.c +++ b/channels.c | |||
@@ -707,8 +707,8 @@ channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset) | |||
707 | FD_SET(c->wfd, writeset); | 707 | FD_SET(c->wfd, writeset); |
708 | } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { | 708 | } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { |
709 | if (CHANNEL_EFD_OUTPUT_ACTIVE(c)) | 709 | if (CHANNEL_EFD_OUTPUT_ACTIVE(c)) |
710 | debug2("channel %d: obuf_empty delayed efd %d/(%d)", | 710 | debug2("channel %d: obuf_empty delayed efd %d/(%d)", |
711 | c->self, c->efd, buffer_len(&c->extended)); | 711 | c->self, c->efd, buffer_len(&c->extended)); |
712 | else | 712 | else |
713 | chan_obuf_empty(c); | 713 | chan_obuf_empty(c); |
714 | } | 714 | } |
@@ -1641,8 +1641,8 @@ channel_output_poll(void) | |||
1641 | * hack for extended data: delay EOF if EFD still in use. | 1641 | * hack for extended data: delay EOF if EFD still in use. |
1642 | */ | 1642 | */ |
1643 | if (CHANNEL_EFD_INPUT_ACTIVE(c)) | 1643 | if (CHANNEL_EFD_INPUT_ACTIVE(c)) |
1644 | debug2("channel %d: ibuf_empty delayed efd %d/(%d)", | 1644 | debug2("channel %d: ibuf_empty delayed efd %d/(%d)", |
1645 | c->self, c->efd, buffer_len(&c->extended)); | 1645 | c->self, c->efd, buffer_len(&c->extended)); |
1646 | else | 1646 | else |
1647 | chan_ibuf_empty(c); | 1647 | chan_ibuf_empty(c); |
1648 | } | 1648 | } |
diff --git a/clientloop.c b/clientloop.c index 15945a80d..aa8e9bedb 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -481,7 +481,7 @@ process_cmdline(void) | |||
481 | int local = 0; | 481 | int local = 0; |
482 | 482 | ||
483 | leave_raw_mode(); | 483 | leave_raw_mode(); |
484 | handler = signal(SIGINT, SIG_IGN); | 484 | handler = signal(SIGINT, SIG_IGN); |
485 | cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); | 485 | cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); |
486 | if (s == NULL) | 486 | if (s == NULL) |
487 | goto out; | 487 | goto out; |
@@ -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.43 2002/04/21 18:26:10 tim Exp $"); | 48 | RCSID("$Id: entropy.c,v 1.44 2002/06/09 19:41:48 mouring 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 |
@@ -115,7 +115,7 @@ seed_rng(void) | |||
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 | mysignal(SIGCHLD, old_sigchld); | 119 | mysignal(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 */ |
@@ -411,8 +411,8 @@ chan_is_dead(Channel *c, int send) | |||
411 | c->extended_usage == CHAN_EXTENDED_WRITE && | 411 | c->extended_usage == CHAN_EXTENDED_WRITE && |
412 | c->efd != -1 && | 412 | c->efd != -1 && |
413 | buffer_len(&c->extended) > 0) { | 413 | buffer_len(&c->extended) > 0) { |
414 | debug2("channel %d: active efd: %d len %d", | 414 | debug2("channel %d: active efd: %d len %d", |
415 | c->self, c->efd, buffer_len(&c->extended)); | 415 | c->self, c->efd, buffer_len(&c->extended)); |
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
418 | if (!(c->flags & CHAN_CLOSE_SENT)) { | 418 | if (!(c->flags & CHAN_CLOSE_SENT)) { |
@@ -1120,7 +1120,7 @@ launch_login(struct passwd *pw, const char *hostname) | |||
1120 | 1120 | ||
1121 | execl(LOGIN_PROGRAM, "login", "-h", hostname, | 1121 | execl(LOGIN_PROGRAM, "login", "-h", hostname, |
1122 | #ifdef xxxLOGIN_NEEDS_TERM | 1122 | #ifdef xxxLOGIN_NEEDS_TERM |
1123 | (s->term ? s->term : "unknown"), | 1123 | (s->term ? s->term : "unknown"), |
1124 | #endif /* LOGIN_NEEDS_TERM */ | 1124 | #endif /* LOGIN_NEEDS_TERM */ |
1125 | #ifdef LOGIN_NO_ENDOPT | 1125 | #ifdef LOGIN_NO_ENDOPT |
1126 | "-p", "-f", pw->pw_name, (char *)NULL); | 1126 | "-p", "-f", pw->pw_name, (char *)NULL); |
diff --git a/sftp-client.c b/sftp-client.c index 0d42696ae..2f9faff18 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1061,7 +1061,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
1061 | 1061 | ||
1062 | if (id == startid || len == 0 || | 1062 | if (id == startid || len == 0 || |
1063 | id - ackid >= conn->num_requests) { | 1063 | id - ackid >= conn->num_requests) { |
1064 | u_int r_id; | 1064 | u_int r_id; |
1065 | 1065 | ||
1066 | buffer_clear(&msg); | 1066 | buffer_clear(&msg); |
1067 | get_msg(conn->fd_in, &msg); | 1067 | get_msg(conn->fd_in, &msg); |
@@ -238,8 +238,8 @@ main(int argc, char **argv) | |||
238 | interactive_loop(in, out, file1, file2); | 238 | interactive_loop(in, out, file1, file2); |
239 | 239 | ||
240 | #if !defined(USE_PIPES) | 240 | #if !defined(USE_PIPES) |
241 | shutdown(in, SHUT_RDWR); | 241 | shutdown(in, SHUT_RDWR); |
242 | shutdown(out, SHUT_RDWR); | 242 | shutdown(out, SHUT_RDWR); |
243 | #endif | 243 | #endif |
244 | 244 | ||
245 | close(in); | 245 | close(in); |
diff --git a/ssh-agent.c b/ssh-agent.c index 56db292ba..06e4d2316 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -617,7 +617,7 @@ process_remove_smartcard_key(SocketEntry *e) | |||
617 | version = k->type == KEY_RSA1 ? 1 : 2; | 617 | version = k->type == KEY_RSA1 ? 1 : 2; |
618 | if ((id = lookup_identity(k, version)) != NULL) { | 618 | if ((id = lookup_identity(k, version)) != NULL) { |
619 | tab = idtab_lookup(version); | 619 | tab = idtab_lookup(version); |
620 | TAILQ_REMOVE(&tab->idlist, id, next); | 620 | TAILQ_REMOVE(&tab->idlist, id, next); |
621 | tab->nentries--; | 621 | tab->nentries--; |
622 | free_identity(id); | 622 | free_identity(id); |
623 | success = 1; | 623 | success = 1; |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 250e53e14..5d26200e5 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -416,7 +416,7 @@ do_upload(struct passwd *pw, const char *sc_reader_id) | |||
416 | key_free(prv); | 416 | key_free(prv); |
417 | if (ret < 0) | 417 | if (ret < 0) |
418 | exit(1); | 418 | exit(1); |
419 | log("loading key done"); | 419 | log("loading key done"); |
420 | exit(0); | 420 | exit(0); |
421 | } | 421 | } |
422 | 422 | ||
diff --git a/ssh-keysign.c b/ssh-keysign.c index 660294bc9..78929b2e0 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -143,9 +143,9 @@ main(int argc, char **argv) | |||
143 | seteuid(getuid()); | 143 | seteuid(getuid()); |
144 | setuid(getuid()); | 144 | setuid(getuid()); |
145 | 145 | ||
146 | init_rng(); | 146 | init_rng(); |
147 | seed_rng(); | 147 | seed_rng(); |
148 | arc4random_stir(); | 148 | arc4random_stir(); |
149 | 149 | ||
150 | #ifdef DEBUG_SSH_KEYSIGN | 150 | #ifdef DEBUG_SSH_KEYSIGN |
151 | log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0); | 151 | log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0); |
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index 8f2283ead..364d5d270 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.6 2002/04/14 09:27:13 djm Exp $"); | 42 | RCSID("$Id: ssh-rand-helper.c,v 1.7 2002/06/09 19:41:49 mouring 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 |
@@ -391,7 +391,7 @@ hash_command_output(entropy_cmd_t *src, char *hash) | |||
391 | 391 | ||
392 | if (waitpid(pid, &status, 0) == -1) { | 392 | if (waitpid(pid, &status, 0) == -1) { |
393 | error("Couldn't wait for child '%s' completion: %s", | 393 | error("Couldn't wait for child '%s' completion: %s", |
394 | src->cmdstring, strerror(errno)); | 394 | src->cmdstring, strerror(errno)); |
395 | return 0.0; | 395 | return 0.0; |
396 | } | 396 | } |
397 | 397 | ||
diff --git a/sshconnect.h b/sshconnect.h index ad34ee64a..134b59af9 100644 --- a/sshconnect.h +++ b/sshconnect.h | |||
@@ -28,9 +28,9 @@ | |||
28 | 28 | ||
29 | typedef struct Sensitive Sensitive; | 29 | typedef struct Sensitive Sensitive; |
30 | struct Sensitive { | 30 | struct Sensitive { |
31 | Key **keys; | 31 | Key **keys; |
32 | int nkeys; | 32 | int nkeys; |
33 | int external_keysign; | 33 | int external_keysign; |
34 | }; | 34 | }; |
35 | 35 | ||
36 | int | 36 | int |
@@ -164,8 +164,8 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
164 | #else /* HAVE_DEV_PTS_AND_PTC */ | 164 | #else /* HAVE_DEV_PTS_AND_PTC */ |
165 | #ifdef _CRAY | 165 | #ifdef _CRAY |
166 | char buf[64]; | 166 | char buf[64]; |
167 | int i; | 167 | int i; |
168 | int highpty; | 168 | int highpty; |
169 | 169 | ||
170 | #ifdef _SC_CRAY_NPTY | 170 | #ifdef _SC_CRAY_NPTY |
171 | highpty = sysconf(_SC_CRAY_NPTY); | 171 | highpty = sysconf(_SC_CRAY_NPTY); |
@@ -289,7 +289,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) | |||
289 | if (fd < 0) | 289 | if (fd < 0) |
290 | error("%.100s: %.100s", ttyname, strerror(errno)); | 290 | error("%.100s: %.100s", ttyname, strerror(errno)); |
291 | close(*ttyfd); | 291 | close(*ttyfd); |
292 | *ttyfd = fd; | 292 | *ttyfd = fd; |
293 | #else /* _CRAY */ | 293 | #else /* _CRAY */ |
294 | 294 | ||
295 | /* First disconnect from the old controlling tty. */ | 295 | /* First disconnect from the old controlling tty. */ |