Imported Debian patch 1.5-15

[debian/pax] / cache.c

diff --git a/cache.c b/cache.c
index 60301d88d2d35004486052b8ef468b0bcfdc7db1..0e4730a7a76b9dcf8bd6313f03f7bade34753b4f 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -231,7 +231,11 @@ name_uid(uid, frc)
         * No entry for this uid, we will add it
         */
        if (!pwopn) {
+#ifdef DEBIAN
+               setpwent();
+#else
                setpassent(1);
+#endif
                ++pwopn;
        }
        if (ptr == NULL)
@@ -309,7 +313,11 @@ name_gid(gid, frc)
         * No entry for this gid, we will add it
         */
        if (!gropn) {
+#ifdef DEBIAN
+               setgrent();
+#else
                setgroupent(1);
+#endif
                ++gropn;
        }
        if (ptr == NULL)
@@ -388,7 +396,11 @@ uid_name(name, uid)
        }
 
        if (!pwopn) {
+#ifdef DEBIAN
+               setpwent();
+#else
                setpassent(1);
+#endif
                ++pwopn;
        }
 
@@ -458,7 +470,11 @@ gid_name(name, gid)
        }
 
        if (!gropn) {
+#ifdef DEBIAN
+               setgrent();
+#else
                setgroupent(1);
+#endif
                ++gropn;
        }
        if (ptr == NULL)