diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/getpwent.c | 17 | ||||
| -rw-r--r-- | lib/libc/gen/pwcache.c | 15 | ||||
| -rw-r--r-- | lib/libc/shlib_version | 4 | ||||
| -rw-r--r-- | lib/libc_r/shlib_version | 4 | ||||
| -rw-r--r-- | lib/libkvm/shlib_version | 4 | ||||
| -rw-r--r-- | lib/libutil/shlib_version | 2 |
6 files changed, 22 insertions, 24 deletions
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index 1ff377ee9ea..ce0d3734c4d 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getpwent.c,v 1.19 2000/04/25 19:11:48 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: getpwent.c,v 1.20 2001/01/31 17:42:25 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -41,7 +41,6 @@ static char rcsid[] = "$OpenBSD: getpwent.c,v 1.19 2000/04/25 19:11:48 deraadt E #include <db.h> #include <syslog.h> #include <pwd.h> -#include <utmp.h> #include <errno.h> #include <unistd.h> #include <stdlib.h> @@ -496,7 +495,7 @@ __has_yppw() DBT key, data; DBT pkey, pdata; int len; - char bf[UT_NAMESIZE]; + char bf[_PW_NAME_LEN]; key.data = (u_char *)_PW_YPTOKEN; key.size = strlen(_PW_YPTOKEN); @@ -504,9 +503,9 @@ __has_yppw() /* Pre-token database support. */ bf[0] = _PW_KEYBYNAME; len = strlen("+"); - bcopy("+", bf + 1, MIN(len, UT_NAMESIZE)); + bcopy("+", bf + 1, MIN(len, _PW_NAME_LEN)); pkey.data = (u_char *)bf; - pkey.size = MIN(len, UT_NAMESIZE) + 1; + pkey.size = MIN(len, _PW_NAME_LEN) + 1; if ((_pw_db->get)(_pw_db, &key, &data, 0) && (_pw_db->get)(_pw_db, &pkey, &pdata, 0)) @@ -572,7 +571,7 @@ getpwnam(name) { DBT key; int len, rval; - char bf[UT_NAMESIZE + 1]; + char bf[_PW_NAME_LEN + 1]; if (!_pw_db && !__initdb()) return ((struct passwd *)NULL); @@ -728,12 +727,12 @@ pwnam_netgrp: bf[0] = _PW_KEYBYNAME; len = strlen(name); - if (len > UT_NAMESIZE) + if (len > _PW_NAME_LEN) rval = 0; else { - bcopy(name, bf + 1, MIN(len, UT_NAMESIZE)); + bcopy(name, bf + 1, MIN(len, _PW_NAME_LEN)); key.data = (u_char *)bf; - key.size = MIN(len, UT_NAMESIZE) + 1; + key.size = MIN(len, _PW_NAME_LEN) + 1; rval = __hashpw(&key); } diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c index 6b1997baced..509bdbb10b5 100644 --- a/lib/libc/gen/pwcache.c +++ b/lib/libc/gen/pwcache.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: pwcache.c,v 1.3 1997/07/09 00:28:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: pwcache.c,v 1.4 2001/01/31 17:42:25 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -41,7 +41,6 @@ static char rcsid[] = "$OpenBSD: pwcache.c,v 1.3 1997/07/09 00:28:23 millert Exp #include <pwd.h> #include <stdio.h> #include <string.h> -#include <utmp.h> #define NCACHE 64 /* power of 2 */ #define MASK (NCACHE - 1) /* bits to store with */ @@ -53,7 +52,7 @@ user_from_uid(uid, nouser) { static struct ncache { uid_t uid; - char name[UT_NAMESIZE + 1]; + char name[_PW_NAME_LEN + 1]; } c_uid[NCACHE]; static int pwopen; static char nbuf[15]; /* 32 bits == 10 digits */ @@ -73,8 +72,8 @@ user_from_uid(uid, nouser) return (nbuf); } cp->uid = uid; - (void)strncpy(cp->name, pw->pw_name, UT_NAMESIZE); - cp->name[UT_NAMESIZE] = '\0'; + (void)strncpy(cp->name, pw->pw_name, _PW_NAME_LEN); + cp->name[_PW_NAME_LEN] = '\0'; } return (cp->name); } @@ -86,7 +85,7 @@ group_from_gid(gid, nogroup) { static struct ncache { gid_t gid; - char name[UT_NAMESIZE + 1]; + char name[_PW_NAME_LEN + 1]; } c_gid[NCACHE]; static int gropen; static char nbuf[15]; /* 32 bits == 10 digits */ @@ -106,8 +105,8 @@ group_from_gid(gid, nogroup) return (nbuf); } cp->gid = gid; - (void)strncpy(cp->name, gr->gr_name, UT_NAMESIZE); - cp->name[UT_NAMESIZE] = '\0'; + (void)strncpy(cp->name, gr->gr_name, _PW_NAME_LEN); + cp->name[_PW_NAME_LEN] = '\0'; } return (cp->name); } diff --git a/lib/libc/shlib_version b/lib/libc/shlib_version index 9ee4bc78996..c622cb8cdf3 100644 --- a/lib/libc/shlib_version +++ b/lib/libc/shlib_version @@ -1,2 +1,2 @@ -major=25 -minor=4 +major=26 +minor=0 diff --git a/lib/libc_r/shlib_version b/lib/libc_r/shlib_version index b25072f4e52..d9961ea9fef 100644 --- a/lib/libc_r/shlib_version +++ b/lib/libc_r/shlib_version @@ -1,2 +1,2 @@ -major=3 -minor=3 +major=4 +minor=0 diff --git a/lib/libkvm/shlib_version b/lib/libkvm/shlib_version index 900b4048a96..9c1551636c5 100644 --- a/lib/libkvm/shlib_version +++ b/lib/libkvm/shlib_version @@ -1,2 +1,2 @@ -major=5 -minor=1 +major=6 +minor=0 diff --git a/lib/libutil/shlib_version b/lib/libutil/shlib_version index 3066b9771e7..9c1551636c5 100644 --- a/lib/libutil/shlib_version +++ b/lib/libutil/shlib_version @@ -1,2 +1,2 @@ -major=5 +major=6 minor=0 |