Fix errno saving and restoring

[nss_nonlocal.git] / nonlocal-group.c

diff --git a/nonlocal-group.c b/nonlocal-group.c
index 6c3173aae7ece201b744e8750d4a40b132afee76..c75ecf70a9479f22a9acc1bb9cfab90d2da1ed81 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -2,28 +2,25 @@
  * nonlocal-group.c
  * group database for nss_nonlocal proxy
  *
- * Copyright © 2007 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
- * <tabbott@mit.edu>
+ * Copyright © 2007–2010 Anders Kaseorg <andersk@mit.edu> and Tim
+ * Abbott <tabbott@mit.edu>
  *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * This file is part of nss_nonlocal.
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * nss_nonlocal is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * nss_nonlocal is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with nss_nonlocal; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
  */
 
 #define _GNU_SOURCE
@@ -83,9 +80,9 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
 
     size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
     char *buf = malloc(buflen);
+    errno = old_errno;
     if (buf == NULL) {
        *errnop = ENOMEM;
-       errno = old_errno;
        return NSS_STATUS_TRYAGAIN;
     }
 
@@ -106,9 +103,9 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
            free(buf);
            buflen *= 2;
            buf = malloc(buflen);
+           errno = old_errno;
            if (buf == NULL) {
                *errnop = ENOMEM;
-               errno = old_errno;
                return NSS_STATUS_TRYAGAIN;
            }
            goto morebuf;
@@ -116,7 +113,7 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status == NSS_STATUS_SUCCESS) {
-       syslog(LOG_WARNING, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user);
+       syslog(LOG_DEBUG, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user);
        status = NSS_STATUS_NOTFOUND;
     } else if (status != NSS_STATUS_TRYAGAIN) {
        status = NSS_STATUS_SUCCESS;
@@ -136,9 +133,11 @@ check_nonlocal_group(const char *user, struct group *grp, int *errnop)
 
     errno = 0;
     gid = strtoul(grp->gr_name, &end, 10);
-    if (errno == 0 && *end == '\0' && (gid_t)gid == gid)
+    if (errno == 0 && *end == '\0' && (gid_t)gid == gid) {
+       errno = old_errno;
        status = check_nonlocal_gid(user, gid, errnop);
-    errno = old_errno;
+    } else
+       errno = old_errno;
     if (status != NSS_STATUS_SUCCESS)
        return status;
 
@@ -163,9 +162,9 @@ get_local_group(const char *name, struct group *grp, char **buffer, int *errnop)
 
     buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
     *buffer = malloc(buflen);
+    errno = old_errno;
     if (*buffer == NULL) {
        *errnop = ENOMEM;
-       errno = old_errno;
        return NSS_STATUS_TRYAGAIN;
     }
 
@@ -187,9 +186,9 @@ get_local_group(const char *name, struct group *grp, char **buffer, int *errnop)
            free(*buffer);
            buflen *= 2;
            *buffer = malloc(buflen);
+           errno = old_errno;
            if (*buffer == NULL) {
                *errnop = ENOMEM;
-               errno = old_errno;
                return NSS_STATUS_TRYAGAIN;
            }
            goto morebuf;
@@ -477,9 +476,9 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
                        newsize = limit;
                }
                newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0]));
+               errno = old_errno;
                if (newgroups == NULL) {
                    *errnop = ENOMEM;
-                   errno = old_errno;
                    return NSS_STATUS_TRYAGAIN;
                }
                *groupsp = newgroups;