diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-01-25 11:00:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-01-25 11:00:16 +0000 |
| commit | b57018905f25910ac0a4af81e3ea61629a1783e9 (patch) | |
| tree | 4471157391f5871970e71414518da16a6c2fcf13 /nss | |
| parent | 4353f9bef4c341036bc21816c8f011072fafbee5 (diff) | |
Update.
1999-01-26 Geoff Keating <geoffk@ozemail.com.au>
* nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Suppress warning
about potentially uninitialized `flags'.
* nss/nss_db/db-alias.c (internal_setent): Likewise.
1999-01-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/failobj.c: Provide prototype for xyzzy.
1999-01-25 Philip Blundell <pb@nexus.co.uk>
* sysdeps/unix/sysv/linux/arm/clone.S: Correct error check again.
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/nss_db/db-alias.c | 13 | ||||
| -rw-r--r-- | nss/nss_db/db-netgrp.c | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/nss/nss_db/db-alias.c b/nss/nss_db/db-alias.c index 81037ed5f7..bc9eea8a20 100644 --- a/nss/nss_db/db-alias.c +++ b/nss/nss_db/db-alias.c @@ -1,5 +1,5 @@ /* Mail alias file parser in nss_db module. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -60,7 +60,7 @@ internal_setent (int stayopen) { /* We have to make sure the file is `closed on exec'. */ int fd; - int result, flags; + int result; err = db->fd (db, &fd); if (err != 0) @@ -69,12 +69,13 @@ internal_setent (int stayopen) result = -1; } else - result = flags = fcntl (fd, F_GETFD, 0); - if (result >= 0) { - flags |= FD_CLOEXEC; - result = fcntl (fd, F_SETFD, flags); + result = fcntl (fd, F_GETFD, 0); + + if (result >= 0) + result = fcntl (fd, F_SETFD, result | FD_CLOEXEC); } + if (result < 0) { /* Something went wrong. Close the stream and return a diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c index 8707d85f04..722281d116 100644 --- a/nss/nss_db/db-netgrp.c +++ b/nss/nss_db/db-netgrp.c @@ -1,5 +1,5 @@ /* Netgroup file parser in nss_db modules. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -61,7 +61,7 @@ _nss_db_setnetgrent (const char *group) { /* We have to make sure the file is `closed on exec'. */ int fd; - int result, flags; + int result; err = db->fd (db, &fd); if (err != 0) @@ -70,12 +70,13 @@ _nss_db_setnetgrent (const char *group) result = -1; } else - result = flags = fcntl (fd, F_GETFD, 0); - if (result >= 0) { - flags |= FD_CLOEXEC; - result = fcntl (fd, F_SETFD, flags); + result = fcntl (fd, F_GETFD, 0); + + if (result >= 0) + result = fcntl (fd, F_SETFD, result | FD_CLOEXEC); } + if (result < 0) { /* Something went wrong. Close the stream and return a |