diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-15 14:27:16 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-15 14:27:16 +0000 |
commit | 206941fdd88031e76da1e2aa0b5dd3b8d1d5d38b (patch) | |
tree | b65242384506b68308282d08ed4b9ca16f09d052 | |
parent | ac2f00390392b22bfc971146e61c440ce62cf242 (diff) |
- markus@cvs.openbsd.org 2001/04/15 08:43:47
[dh.c sftp-glob.c sftp-glob.h sftp-int.c sshconnect2.c sshd.c]
some unused variable and typos; from tomh@po.crl.go.jp
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dh.c | 11 | ||||
-rw-r--r-- | sftp-glob.c | 4 | ||||
-rw-r--r-- | sftp-glob.h | 4 | ||||
-rw-r--r-- | sftp-int.c | 8 | ||||
-rw-r--r-- | sshconnect2.c | 6 | ||||
-rw-r--r-- | sshd.c | 6 |
7 files changed, 23 insertions, 21 deletions
@@ -3,6 +3,9 @@ | |||
3 | - stevesk@cvs.openbsd.org 2001/04/15 01:35:22 | 3 | - stevesk@cvs.openbsd.org 2001/04/15 01:35:22 |
4 | [ttymodes.c] | 4 | [ttymodes.c] |
5 | fix comments | 5 | fix comments |
6 | - markus@cvs.openbsd.org 2001/04/15 08:43:47 | ||
7 | [dh.c sftp-glob.c sftp-glob.h sftp-int.c sshconnect2.c sshd.c] | ||
8 | some unused variable and typos; from tomh@po.crl.go.jp | ||
6 | 9 | ||
7 | 20010415 | 10 | 20010415 |
8 | - OpenBSD CVS Sync | 11 | - OpenBSD CVS Sync |
@@ -5088,4 +5091,4 @@ | |||
5088 | - Wrote replacements for strlcpy and mkdtemp | 5091 | - Wrote replacements for strlcpy and mkdtemp |
5089 | - Released 1.0pre1 | 5092 | - Released 1.0pre1 |
5090 | 5093 | ||
5091 | $Id: ChangeLog,v 1.1117 2001/04/15 14:25:12 mouring Exp $ | 5094 | $Id: ChangeLog,v 1.1118 2001/04/15 14:27:16 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.13 2001/04/04 23:09:17 markus Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.14 2001/04/15 08:43:45 markus Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -80,10 +80,10 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg) | |||
80 | 80 | ||
81 | dhg->g = BN_new(); | 81 | dhg->g = BN_new(); |
82 | dhg->p = BN_new(); | 82 | dhg->p = BN_new(); |
83 | if (BN_hex2bn(&dhg->g, gen) < 0) | 83 | if (BN_hex2bn(&dhg->g, gen) == 0) |
84 | goto failclean; | 84 | goto failclean; |
85 | 85 | ||
86 | if (BN_hex2bn(&dhg->p, prime) < 0) | 86 | if (BN_hex2bn(&dhg->p, prime) == 0) |
87 | goto failclean; | 87 | goto failclean; |
88 | 88 | ||
89 | if (BN_num_bits(dhg->p) != dhg->size) | 89 | if (BN_num_bits(dhg->p) != dhg->size) |
@@ -228,15 +228,14 @@ DH * | |||
228 | dh_new_group_asc(const char *gen, const char *modulus) | 228 | dh_new_group_asc(const char *gen, const char *modulus) |
229 | { | 229 | { |
230 | DH *dh; | 230 | DH *dh; |
231 | int ret; | ||
232 | 231 | ||
233 | dh = DH_new(); | 232 | dh = DH_new(); |
234 | if (dh == NULL) | 233 | if (dh == NULL) |
235 | fatal("DH_new"); | 234 | fatal("DH_new"); |
236 | 235 | ||
237 | if ((ret = BN_hex2bn(&dh->p, modulus)) < 0) | 236 | if (BN_hex2bn(&dh->p, modulus) == 0) |
238 | fatal("BN_hex2bn p"); | 237 | fatal("BN_hex2bn p"); |
239 | if ((ret = BN_hex2bn(&dh->g, gen)) < 0) | 238 | if (BN_hex2bn(&dh->g, gen) == 0) |
240 | fatal("BN_hex2bn g"); | 239 | fatal("BN_hex2bn g"); |
241 | 240 | ||
242 | return (dh); | 241 | return (dh); |
diff --git a/sftp-glob.c b/sftp-glob.c index 535241002..aee5e91ac 100644 --- a/sftp-glob.c +++ b/sftp-glob.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sftp-glob.c,v 1.4 2001/04/05 10:42:53 markus Exp $"); | 26 | RCSID("$OpenBSD: sftp-glob.c,v 1.5 2001/04/15 08:43:46 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "buffer.h" | 29 | #include "buffer.h" |
@@ -151,7 +151,7 @@ int fudge_stat(const char *path, struct stat *st) | |||
151 | 151 | ||
152 | int | 152 | int |
153 | remote_glob(int fd_in, int fd_out, const char *pattern, int flags, | 153 | remote_glob(int fd_in, int fd_out, const char *pattern, int flags, |
154 | const int (*errfunc)(const char *, int), glob_t *pglob) | 154 | int (*errfunc)(const char *, int), glob_t *pglob) |
155 | { | 155 | { |
156 | pglob->gl_opendir = (void*)fudge_opendir; | 156 | pglob->gl_opendir = (void*)fudge_opendir; |
157 | pglob->gl_readdir = (void*)fudge_readdir; | 157 | pglob->gl_readdir = (void*)fudge_readdir; |
diff --git a/sftp-glob.h b/sftp-glob.h index 944f32865..4206af439 100644 --- a/sftp-glob.h +++ b/sftp-glob.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-glob.h,v 1.2 2001/04/05 10:42:53 markus Exp $ */ | 1 | /* $OpenBSD: sftp-glob.h,v 1.3 2001/04/15 08:43:46 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2001 Damien Miller. All rights reserved. |
@@ -28,5 +28,5 @@ | |||
28 | 28 | ||
29 | int | 29 | int |
30 | remote_glob(int fd_in, int fd_out, const char *pattern, int flags, | 30 | remote_glob(int fd_in, int fd_out, const char *pattern, int flags, |
31 | const int (*errfunc)(const char *, int), glob_t *pglob); | 31 | int (*errfunc)(const char *, int), glob_t *pglob); |
32 | 32 | ||
diff --git a/sftp-int.c b/sftp-int.c index 8ec504dbf..46e405e0d 100644 --- a/sftp-int.c +++ b/sftp-int.c | |||
@@ -26,7 +26,7 @@ | |||
26 | /* XXX: recursive operations */ | 26 | /* XXX: recursive operations */ |
27 | 27 | ||
28 | #include "includes.h" | 28 | #include "includes.h" |
29 | RCSID("$OpenBSD: sftp-int.c,v 1.35 2001/04/12 23:17:54 mouring Exp $"); | 29 | RCSID("$OpenBSD: sftp-int.c,v 1.36 2001/04/15 08:43:46 markus Exp $"); |
30 | 30 | ||
31 | #include "buffer.h" | 31 | #include "buffer.h" |
32 | #include "xmalloc.h" | 32 | #include "xmalloc.h" |
@@ -146,7 +146,7 @@ help(void) | |||
146 | void | 146 | void |
147 | local_do_shell(const char *args) | 147 | local_do_shell(const char *args) |
148 | { | 148 | { |
149 | int ret, status; | 149 | int status; |
150 | char *shell; | 150 | char *shell; |
151 | pid_t pid; | 151 | pid_t pid; |
152 | 152 | ||
@@ -163,10 +163,10 @@ local_do_shell(const char *args) | |||
163 | /* XXX: child has pipe fds to ssh subproc open - issue? */ | 163 | /* XXX: child has pipe fds to ssh subproc open - issue? */ |
164 | if (args) { | 164 | if (args) { |
165 | debug3("Executing %s -c \"%s\"", shell, args); | 165 | debug3("Executing %s -c \"%s\"", shell, args); |
166 | ret = execl(shell, shell, "-c", args, NULL); | 166 | execl(shell, shell, "-c", args, NULL); |
167 | } else { | 167 | } else { |
168 | debug3("Executing %s", shell); | 168 | debug3("Executing %s", shell); |
169 | ret = execl(shell, shell, NULL); | 169 | execl(shell, shell, NULL); |
170 | } | 170 | } |
171 | fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, | 171 | fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, |
172 | strerror(errno)); | 172 | strerror(errno)); |
diff --git a/sshconnect2.c b/sshconnect2.c index 9a1d2576e..4acdd0171 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.68 2001/04/12 19:15:25 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.69 2001/04/15 08:43:47 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -358,7 +358,7 @@ input_userauth_pk_ok(int type, int plen, void *ctxt) | |||
358 | Authctxt *authctxt = ctxt; | 358 | Authctxt *authctxt = ctxt; |
359 | Key *key = NULL; | 359 | Key *key = NULL; |
360 | Buffer b; | 360 | Buffer b; |
361 | int alen, blen, pktype, sent = 0; | 361 | int alen, blen, sent = 0; |
362 | char *pkalg, *pkblob, *fp; | 362 | char *pkalg, *pkblob, *fp; |
363 | 363 | ||
364 | if (authctxt == NULL) | 364 | if (authctxt == NULL) |
@@ -386,7 +386,7 @@ input_userauth_pk_ok(int type, int plen, void *ctxt) | |||
386 | debug("no last key or no sign cb"); | 386 | debug("no last key or no sign cb"); |
387 | break; | 387 | break; |
388 | } | 388 | } |
389 | if ((pktype = key_type_from_name(pkalg)) == KEY_UNSPEC) { | 389 | if (key_type_from_name(pkalg) == KEY_UNSPEC) { |
390 | debug("unknown pkalg %s", pkalg); | 390 | debug("unknown pkalg %s", pkalg); |
391 | break; | 391 | break; |
392 | } | 392 | } |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.193 2001/04/12 20:09:38 stevesk Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.194 2001/04/15 08:43:47 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -799,9 +799,9 @@ main(int ac, char **av) | |||
799 | 799 | ||
800 | /* Start listening for a socket, unless started from inetd. */ | 800 | /* Start listening for a socket, unless started from inetd. */ |
801 | if (inetd_flag) { | 801 | if (inetd_flag) { |
802 | int s1, s2; | 802 | int s1; |
803 | s1 = dup(0); /* Make sure descriptors 0, 1, and 2 are in use. */ | 803 | s1 = dup(0); /* Make sure descriptors 0, 1, and 2 are in use. */ |
804 | s2 = dup(s1); | 804 | dup(s1); |
805 | sock_in = dup(0); | 805 | sock_in = dup(0); |
806 | sock_out = dup(1); | 806 | sock_out = dup(1); |
807 | startup_pipe = -1; | 807 | startup_pipe = -1; |