From 8e1cb92b6b284beb94e09cfdf1027e4e8e63340b Mon Sep 17 00:00:00 2001 From: nectar Date: Fri, 18 Apr 2003 14:11:17 +0000 Subject: 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 Sponsored by: DARPA, Network Associates Laboratories --- lib/libc/gen/getpwent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libc') 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; -- cgit v1.1