diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
commit | 226cfa03781466907dd252916aeade6879e376b8 (patch) | |
tree | 3251d15053db065d74994b95e17fd65874fcaa9b /util.c | |
parent | 401d58f3612fa030f309d01df9815a2fc1d3c6de (diff) |
Hopefully things did not get mixed around too much. It compiles under
Linux and works. So that is at least a good sign. =)
20010122
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
[servconf.c ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
- markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
[auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
ssh1.h sshconnect1.c sshd.c ttymodes.c]
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
- markus@cvs.openbsd.org 2001/01/19 16:48:14
[sshd.8]
fix typo; from stevesk@
- markus@cvs.openbsd.org 2001/01/19 16:50:58
[ssh-dss.c]
clear and free digest, make consistent with other code (use dlen); from
stevesk@
- markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
[auth-options.c auth-options.h auth-rsa.c auth2.c]
pass the filename to auth_parse_options()
- markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
[readconf.c]
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
- stevesk@cvs.openbsd.org 2001/01/20 18:20:29
[sshconnect2.c]
dh_new_group() does not return NULL. ok markus@
- markus@cvs.openbsd.org 2001/01/20 21:33:42
[ssh-add.c]
do not loop forever if askpass does not exist; from
andrew@pimlott.ne.mediaone.net
- djm@cvs.openbsd.org 2001/01/20 23:00:56
[servconf.c]
Check for NULL return from strdelim; ok markus
- djm@cvs.openbsd.org 2001/01/20 23:02:07
[readconf.c]
KNF; ok markus
- jakob@cvs.openbsd.org 2001/01/21 9:00:33
[ssh-keygen.1]
remove -R flag; ok markus@
- markus@cvs.openbsd.org 2001/01/21 19:05:40
[atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c
cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
key.c key.h log-client.c log-server.c log.c log.h login.c login.h
match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
ttysmodes.c uidswap.c xmalloc.c]
split ssh.h and try to cleanup the #include mess. remove unnecessary
#includes. rename util.[ch] -> misc.[ch]
- (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
- (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
conflict when compiling for non-kerb install
- (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
on 1/19.
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/util.c b/util.c deleted file mode 100644 index 1a591a6f0..000000000 --- a/util.c +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | /* $OpenBSD: util.c,v 1.6 2000/10/27 07:32:19 markus Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | ||
5 | * | ||
6 | * Redistribution and use in source and binary forms, with or without | ||
7 | * modification, are permitted provided that the following conditions | ||
8 | * are met: | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * 2. Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | */ | ||
26 | |||
27 | #include "includes.h" | ||
28 | RCSID("$OpenBSD: util.c,v 1.6 2000/10/27 07:32:19 markus Exp $"); | ||
29 | |||
30 | #include "ssh.h" | ||
31 | |||
32 | char * | ||
33 | chop(char *s) | ||
34 | { | ||
35 | char *t = s; | ||
36 | while (*t) { | ||
37 | if(*t == '\n' || *t == '\r') { | ||
38 | *t = '\0'; | ||
39 | return s; | ||
40 | } | ||
41 | t++; | ||
42 | } | ||
43 | return s; | ||
44 | |||
45 | } | ||
46 | |||
47 | void | ||
48 | set_nonblock(int fd) | ||
49 | { | ||
50 | int val; | ||
51 | val = fcntl(fd, F_GETFL, 0); | ||
52 | if (val < 0) { | ||
53 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); | ||
54 | return; | ||
55 | } | ||
56 | if (val & O_NONBLOCK) { | ||
57 | debug("fd %d IS O_NONBLOCK", fd); | ||
58 | return; | ||
59 | } | ||
60 | debug("fd %d setting O_NONBLOCK", fd); | ||
61 | val |= O_NONBLOCK; | ||
62 | if (fcntl(fd, F_SETFL, val) == -1) | ||
63 | if (errno != ENODEV) | ||
64 | error("fcntl(%d, F_SETFL, O_NONBLOCK): %s", | ||
65 | fd, strerror(errno)); | ||
66 | } | ||
67 | |||
68 | /* Characters considered whitespace in strsep calls. */ | ||
69 | #define WHITESPACE " \t\r\n" | ||
70 | |||
71 | char * | ||
72 | strdelim(char **s) | ||
73 | { | ||
74 | char *old; | ||
75 | int wspace = 0; | ||
76 | |||
77 | if (*s == NULL) | ||
78 | return NULL; | ||
79 | |||
80 | old = *s; | ||
81 | |||
82 | *s = strpbrk(*s, WHITESPACE "="); | ||
83 | if (*s == NULL) | ||
84 | return (old); | ||
85 | |||
86 | /* Allow only one '=' to be skipped */ | ||
87 | if (*s[0] == '=') | ||
88 | wspace = 1; | ||
89 | *s[0] = '\0'; | ||
90 | |||
91 | *s += strspn(*s + 1, WHITESPACE) + 1; | ||
92 | if (*s[0] == '=' && !wspace) | ||
93 | *s += strspn(*s + 1, WHITESPACE) + 1; | ||
94 | |||
95 | return (old); | ||
96 | } | ||