2000-09-16 02:29:08 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
2000-08-18 04:01:04 +00:00
|
|
|
#include "includes.h"
|
2004-06-15 00:35:30 +00:00
|
|
|
RCSID("$OpenBSD: misc.c,v 1.24 2004/06/14 01:44:39 djm Exp $");
|
2000-08-18 04:01:04 +00:00
|
|
|
|
2001-02-04 13:20:36 +00:00
|
|
|
#include "misc.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "log.h"
|
2001-03-05 06:09:31 +00:00
|
|
|
#include "xmalloc.h"
|
2000-08-18 04:01:04 +00:00
|
|
|
|
2001-07-04 04:46:56 +00:00
|
|
|
/* remove newline at end of string */
|
2000-08-18 04:01:04 +00:00
|
|
|
char *
|
|
|
|
chop(char *s)
|
|
|
|
{
|
|
|
|
char *t = s;
|
|
|
|
while (*t) {
|
2001-12-06 18:00:18 +00:00
|
|
|
if (*t == '\n' || *t == '\r') {
|
2000-08-18 04:01:04 +00:00
|
|
|
*t = '\0';
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
t++;
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2001-07-04 04:46:56 +00:00
|
|
|
/* set/unset filedescriptor to non-blocking */
|
2004-06-15 00:35:30 +00:00
|
|
|
int
|
2000-08-18 04:01:04 +00:00
|
|
|
set_nonblock(int fd)
|
|
|
|
{
|
|
|
|
int val;
|
2001-05-12 00:08:37 +00:00
|
|
|
|
2000-08-18 04:01:04 +00:00
|
|
|
val = fcntl(fd, F_GETFL, 0);
|
|
|
|
if (val < 0) {
|
|
|
|
error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));
|
2004-06-15 00:35:30 +00:00
|
|
|
return (-1);
|
2000-08-18 04:01:04 +00:00
|
|
|
}
|
2000-10-28 03:19:58 +00:00
|
|
|
if (val & O_NONBLOCK) {
|
2004-06-15 00:35:30 +00:00
|
|
|
debug3("fd %d is O_NONBLOCK", fd);
|
|
|
|
return (0);
|
2000-10-28 03:19:58 +00:00
|
|
|
}
|
2003-05-14 03:41:39 +00:00
|
|
|
debug2("fd %d setting O_NONBLOCK", fd);
|
2000-08-18 04:01:04 +00:00
|
|
|
val |= O_NONBLOCK;
|
2004-06-15 00:35:30 +00:00
|
|
|
if (fcntl(fd, F_SETFL, val) == -1) {
|
|
|
|
debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s", fd,
|
|
|
|
strerror(errno));
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (0);
|
2000-08-18 04:01:04 +00:00
|
|
|
}
|
|
|
|
|
2004-06-15 00:35:30 +00:00
|
|
|
int
|
2001-05-12 00:08:37 +00:00
|
|
|
unset_nonblock(int fd)
|
|
|
|
{
|
|
|
|
int val;
|
|
|
|
|
|
|
|
val = fcntl(fd, F_GETFL, 0);
|
|
|
|
if (val < 0) {
|
|
|
|
error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));
|
2004-06-15 00:35:30 +00:00
|
|
|
return (-1);
|
2001-05-12 00:08:37 +00:00
|
|
|
}
|
|
|
|
if (!(val & O_NONBLOCK)) {
|
2004-06-15 00:35:30 +00:00
|
|
|
debug3("fd %d is not O_NONBLOCK", fd);
|
|
|
|
return (0);
|
2001-05-12 00:08:37 +00:00
|
|
|
}
|
2001-06-21 03:04:37 +00:00
|
|
|
debug("fd %d clearing O_NONBLOCK", fd);
|
2001-05-12 00:08:37 +00:00
|
|
|
val &= ~O_NONBLOCK;
|
2004-06-15 00:35:30 +00:00
|
|
|
if (fcntl(fd, F_SETFL, val) == -1) {
|
|
|
|
debug("fcntl(%d, F_SETFL, ~O_NONBLOCK): %s",
|
2002-03-05 01:48:09 +00:00
|
|
|
fd, strerror(errno));
|
2004-06-15 00:35:30 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (0);
|
2001-05-12 00:08:37 +00:00
|
|
|
}
|
|
|
|
|
2002-02-05 00:52:13 +00:00
|
|
|
/* disable nagle on socket */
|
|
|
|
void
|
|
|
|
set_nodelay(int fd)
|
|
|
|
{
|
2002-03-05 01:28:14 +00:00
|
|
|
int opt;
|
|
|
|
socklen_t optlen;
|
2002-02-05 00:52:13 +00:00
|
|
|
|
2002-02-26 18:12:51 +00:00
|
|
|
optlen = sizeof opt;
|
|
|
|
if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen) == -1) {
|
2003-11-03 09:07:14 +00:00
|
|
|
debug("getsockopt TCP_NODELAY: %.100s", strerror(errno));
|
2002-02-26 18:12:51 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (opt == 1) {
|
|
|
|
debug2("fd %d is TCP_NODELAY", fd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
opt = 1;
|
2002-12-23 02:44:36 +00:00
|
|
|
debug2("fd %d setting TCP_NODELAY", fd);
|
2002-02-26 18:12:51 +00:00
|
|
|
if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof opt) == -1)
|
2002-02-05 00:52:13 +00:00
|
|
|
error("setsockopt TCP_NODELAY: %.100s", strerror(errno));
|
|
|
|
}
|
|
|
|
|
2000-08-18 04:01:04 +00:00
|
|
|
/* Characters considered whitespace in strsep calls. */
|
|
|
|
#define WHITESPACE " \t\r\n"
|
|
|
|
|
2001-07-04 04:46:56 +00:00
|
|
|
/* return next token in configuration line */
|
2000-08-18 04:01:04 +00:00
|
|
|
char *
|
|
|
|
strdelim(char **s)
|
|
|
|
{
|
|
|
|
char *old;
|
|
|
|
int wspace = 0;
|
|
|
|
|
|
|
|
if (*s == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
old = *s;
|
|
|
|
|
|
|
|
*s = strpbrk(*s, WHITESPACE "=");
|
|
|
|
if (*s == NULL)
|
|
|
|
return (old);
|
|
|
|
|
|
|
|
/* Allow only one '=' to be skipped */
|
|
|
|
if (*s[0] == '=')
|
|
|
|
wspace = 1;
|
|
|
|
*s[0] = '\0';
|
|
|
|
|
|
|
|
*s += strspn(*s + 1, WHITESPACE) + 1;
|
|
|
|
if (*s[0] == '=' && !wspace)
|
|
|
|
*s += strspn(*s + 1, WHITESPACE) + 1;
|
|
|
|
|
|
|
|
return (old);
|
|
|
|
}
|
2001-02-04 13:20:36 +00:00
|
|
|
|
2001-03-05 05:56:40 +00:00
|
|
|
struct passwd *
|
|
|
|
pwcopy(struct passwd *pw)
|
|
|
|
{
|
|
|
|
struct passwd *copy = xmalloc(sizeof(*copy));
|
2001-03-05 06:22:01 +00:00
|
|
|
|
2001-03-05 05:56:40 +00:00
|
|
|
memset(copy, 0, sizeof(*copy));
|
|
|
|
copy->pw_name = xstrdup(pw->pw_name);
|
|
|
|
copy->pw_passwd = xstrdup(pw->pw_passwd);
|
2001-03-05 06:22:01 +00:00
|
|
|
copy->pw_gecos = xstrdup(pw->pw_gecos);
|
2001-03-05 05:56:40 +00:00
|
|
|
copy->pw_uid = pw->pw_uid;
|
|
|
|
copy->pw_gid = pw->pw_gid;
|
2001-06-22 21:14:18 +00:00
|
|
|
#ifdef HAVE_PW_EXPIRE_IN_PASSWD
|
2001-06-21 03:11:27 +00:00
|
|
|
copy->pw_expire = pw->pw_expire;
|
2001-06-22 21:14:18 +00:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_PW_CHANGE_IN_PASSWD
|
2001-06-21 03:11:27 +00:00
|
|
|
copy->pw_change = pw->pw_change;
|
2001-06-22 21:14:18 +00:00
|
|
|
#endif
|
2001-03-05 07:57:09 +00:00
|
|
|
#ifdef HAVE_PW_CLASS_IN_PASSWD
|
2001-03-05 05:56:40 +00:00
|
|
|
copy->pw_class = xstrdup(pw->pw_class);
|
2001-03-05 07:57:09 +00:00
|
|
|
#endif
|
2001-03-05 05:56:40 +00:00
|
|
|
copy->pw_dir = xstrdup(pw->pw_dir);
|
|
|
|
copy->pw_shell = xstrdup(pw->pw_shell);
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
2001-07-04 04:46:56 +00:00
|
|
|
/*
|
|
|
|
* Convert ASCII string to TCP/IP port number.
|
|
|
|
* Port must be >0 and <=65535.
|
|
|
|
* Return 0 if invalid.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
a2port(const char *s)
|
2001-04-12 23:39:26 +00:00
|
|
|
{
|
|
|
|
long port;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
port = strtol(s, &endp, 0);
|
|
|
|
if (s == endp || *endp != '\0' ||
|
|
|
|
(errno == ERANGE && (port == LONG_MIN || port == LONG_MAX)) ||
|
|
|
|
port <= 0 || port > 65535)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return port;
|
|
|
|
}
|
|
|
|
|
2001-06-05 19:59:08 +00:00
|
|
|
#define SECONDS 1
|
|
|
|
#define MINUTES (SECONDS * 60)
|
|
|
|
#define HOURS (MINUTES * 60)
|
|
|
|
#define DAYS (HOURS * 24)
|
|
|
|
#define WEEKS (DAYS * 7)
|
|
|
|
|
2001-07-04 04:46:56 +00:00
|
|
|
/*
|
|
|
|
* Convert a time string into seconds; format is
|
|
|
|
* a sequence of:
|
|
|
|
* time[qualifier]
|
|
|
|
*
|
|
|
|
* Valid time qualifiers are:
|
|
|
|
* <none> seconds
|
|
|
|
* s|S seconds
|
|
|
|
* m|M minutes
|
|
|
|
* h|H hours
|
|
|
|
* d|D days
|
|
|
|
* w|W weeks
|
|
|
|
*
|
|
|
|
* Examples:
|
|
|
|
* 90m 90 minutes
|
|
|
|
* 1h30m 90 minutes
|
|
|
|
* 2d 2 days
|
|
|
|
* 1w 1 week
|
|
|
|
*
|
|
|
|
* Return -1 if time string is invalid.
|
|
|
|
*/
|
|
|
|
long
|
|
|
|
convtime(const char *s)
|
2001-06-05 19:59:08 +00:00
|
|
|
{
|
|
|
|
long total, secs;
|
|
|
|
const char *p;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
total = 0;
|
|
|
|
p = s;
|
|
|
|
|
|
|
|
if (p == NULL || *p == '\0')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
while (*p) {
|
|
|
|
secs = strtol(p, &endp, 10);
|
|
|
|
if (p == endp ||
|
|
|
|
(errno == ERANGE && (secs == LONG_MIN || secs == LONG_MAX)) ||
|
|
|
|
secs < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
switch (*endp++) {
|
|
|
|
case '\0':
|
|
|
|
endp--;
|
|
|
|
case 's':
|
|
|
|
case 'S':
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
case 'M':
|
|
|
|
secs *= MINUTES;
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
case 'H':
|
|
|
|
secs *= HOURS;
|
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
case 'D':
|
|
|
|
secs *= DAYS;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
case 'W':
|
|
|
|
secs *= WEEKS;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
total += secs;
|
|
|
|
if (total < 0)
|
|
|
|
return -1;
|
|
|
|
p = endp;
|
|
|
|
}
|
|
|
|
|
|
|
|
return total;
|
|
|
|
}
|
|
|
|
|
2001-05-03 23:39:53 +00:00
|
|
|
char *
|
|
|
|
cleanhostname(char *host)
|
|
|
|
{
|
|
|
|
if (*host == '[' && host[strlen(host) - 1] == ']') {
|
|
|
|
host[strlen(host) - 1] = '\0';
|
|
|
|
return (host + 1);
|
|
|
|
} else
|
|
|
|
return host;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
colon(char *cp)
|
|
|
|
{
|
|
|
|
int flag = 0;
|
|
|
|
|
|
|
|
if (*cp == ':') /* Leading colon is part of file name. */
|
|
|
|
return (0);
|
|
|
|
if (*cp == '[')
|
|
|
|
flag = 1;
|
|
|
|
|
|
|
|
for (; *cp; ++cp) {
|
|
|
|
if (*cp == '@' && *(cp+1) == '[')
|
|
|
|
flag = 1;
|
|
|
|
if (*cp == ']' && *(cp+1) == ':' && flag)
|
|
|
|
return (cp+1);
|
|
|
|
if (*cp == ':' && !flag)
|
|
|
|
return (cp);
|
|
|
|
if (*cp == '/')
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2001-07-04 04:46:56 +00:00
|
|
|
/* function to assist building execv() arguments */
|
2001-05-08 20:27:25 +00:00
|
|
|
void
|
|
|
|
addargs(arglist *args, char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
char buf[1024];
|
2003-09-22 11:04:23 +00:00
|
|
|
int nalloc;
|
2001-05-08 20:27:25 +00:00
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vsnprintf(buf, sizeof(buf), fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
2003-09-22 11:04:23 +00:00
|
|
|
nalloc = args->nalloc;
|
2001-05-08 20:27:25 +00:00
|
|
|
if (args->list == NULL) {
|
2003-09-22 11:04:23 +00:00
|
|
|
nalloc = 32;
|
2001-05-08 20:27:25 +00:00
|
|
|
args->num = 0;
|
2003-09-22 11:04:23 +00:00
|
|
|
} else if (args->num+2 >= nalloc)
|
|
|
|
nalloc *= 2;
|
2001-05-08 20:27:25 +00:00
|
|
|
|
2003-09-22 11:04:23 +00:00
|
|
|
args->list = xrealloc(args->list, nalloc * sizeof(char *));
|
|
|
|
args->nalloc = nalloc;
|
2001-05-08 20:27:25 +00:00
|
|
|
args->list[args->num++] = xstrdup(buf);
|
|
|
|
args->list[args->num] = NULL;
|
|
|
|
}
|