diff options
| author | nectar <nectar@FreeBSD.org> | 2003-04-18 14:11:17 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-04-18 14:11:17 +0000 |
| commit | 8e1cb92b6b284beb94e09cfdf1027e4e8e63340b (patch) | |
| tree | fb8dc3c1948512943db80c33abf64ace4c5ad55b /lib/libc | |
| parent | e2c2f3b86293be44009838be94c2f3aaf23b0a1d (diff) | |
| download | FreeBSD-src-8e1cb92b6b284beb94e09cfdf1027e4e8e63340b.zip FreeBSD-src-8e1cb92b6b284beb94e09cfdf1027e4e8e63340b.tar.gz | |
Revert the definitions of _PW_KEY* to their previous values. There is
at least one consumer outside of libc and pwd_mkdb.
Adjust the versioning in libc and pwd_mkdb accordingly.
named was the application affected, and that fact was first
Reported by: Zherdev Anatoly <tolyar@mx.ru>
Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/getpwent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index 15f67df..eb1825f 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -593,7 +593,7 @@ files_passwd(void *retval, void *mdata, va_list ap) } break; } - keybuf[0] |= _PW_VERSION(st->version); + keybuf[0] = _PW_VERSIONED(keybuf[0], st->version); rv = st->db->get(st->db, &key, &entry, 0); if (rv < 0 || rv > 1) { /* should never return > 1 */ *errnop = errno; @@ -1500,7 +1500,7 @@ docompat: memcpy(&keybuf[1], &store, sizeof(store)); key.size = sizeof(store) + 1; } - keybuf[0] = _PW_KEYBYNUM | _PW_VERSION(st->version); + keybuf[0] = _PW_VERSIONED(_PW_KEYBYNUM, st->version); rv = st->db->get(st->db, &key, &entry, 0); if (rv < 0 || rv > 1) { /* should never return > 1 */ *errnop = errno; |
