- (dtucker) [openbsd-compat/pwcache.c] Shrink ifdef area to prevent unused

   variable warnings.

diff --git a/ChangeLog b/ChangeLog
index 0b533798da9354ea882baa4fb9f83cfddcb7f5c0..29e555ab1435bede36ed3bed3eee7e8cc8de0ff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
    - markus@cvs.openbsd.org 2010/01/15 09:24:23
      [sftp-common.c]
      unused
+ - (dtucker) [openbsd-compat/pwcache.c] Shrink ifdef area to prevent unused
+   variable warnings.
 
 20100115
  - (dtucker) OpenBSD CVS Sync

diff --git a/openbsd-compat/pwcache.c b/openbsd-compat/pwcache.c
index fa60935d0d0508828efac3db8417e4084dcb60be..5a8b78801b91138fd93575936429d1052176bd9d 100644 (file)
--- a/openbsd-compat/pwcache.c
+++ b/openbsd-compat/pwcache.c
@@ -58,12 +58,12 @@ user_from_uid(uid_t uid, int nouser)
 
        cp = c_uid + (uid & MASK);
        if (cp->uid != uid || cp->name == NULL) {
-#ifdef HAVE_SETPASSENT
                if (pwopen == 0) {
+#ifdef HAVE_SETPASSENT
                        setpassent(1);
+#endif
                        pwopen = 1;
                }
-#endif
                if ((pw = getpwuid(uid)) == NULL) {
                        if (nouser)
                                return (NULL);
@@ -93,12 +93,12 @@ group_from_gid(gid_t gid, int nogroup)
 
        cp = c_gid + (gid & MASK);
        if (cp->gid != gid || cp->name == NULL) {
-#ifdef HAVE_SETGROUPENT
                if (gropen == 0) {
+#ifdef HAVE_SETGROUPENT
                        setgroupent(1);
+#endif
                        gropen = 1;
                }
-#endif
                if ((gr = getgrgid(gid)) == NULL) {
                        if (nogroup)
                                return (NULL);