Patch from Nick Fedchik to fixup paths in busybox/libpwdgrp

which were not properly using the bb_path_*_file strings.


git-svn-id: svn://busybox.net/trunk/busybox@7108 69ca8d6d-28ef-0310-b511-8ec308f3f277

7 files changed, 7 insertions, 7 deletions

diff --git a/libpwdgrp/getgrgid.c b/libpwdgrp/getgrgid.c
index 73f0cca97..7ffe8c5c3 100644
--- a/libpwdgrp/getgrgid.c
+++ b/libpwdgrp/getgrgid.c
@@ -30,7 +30,7 @@ struct group *getgrgid(const gid_t gid)
         struct group *group;
         int grp_fd;
 
-        if ((grp_fd = open("/etc/group", O_RDONLY)) < 0)
+        if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
                 return NULL;
 
         while ((group = __getgrent(grp_fd)) != NULL)
diff --git a/libpwdgrp/getgrnam.c b/libpwdgrp/getgrnam.c
index 919622ea1..bf7f7646d 100644
--- a/libpwdgrp/getgrnam.c
+++ b/libpwdgrp/getgrnam.c
@@ -36,7 +36,7 @@ struct group *getgrnam(const char *name)
                 return NULL;
         }
 
-        if ((grp_fd = open("/etc/group", O_RDONLY)) < 0)
+        if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
                 return NULL;
 
         while ((group = __getgrent(grp_fd)) != NULL)
diff --git a/libpwdgrp/getpwnam.c b/libpwdgrp/getpwnam.c
index 524fa09be..013f155bc 100644
--- a/libpwdgrp/getpwnam.c
+++ b/libpwdgrp/getpwnam.c
@@ -37,7 +37,7 @@ struct passwd *getpwnam(const char *name)
                 return NULL;
         }
 
-        if ((passwd_fd = open("/etc/passwd", O_RDONLY)) < 0)
+        if ((passwd_fd = open(bb_path_passwd_file, O_RDONLY)) < 0)
                 return NULL;
 
         while ((passwd = __getpwent(passwd_fd)) != NULL)
diff --git a/libpwdgrp/getpwuid.c b/libpwdgrp/getpwuid.c
index 7a04b67ca..bae6e15e6 100644
--- a/libpwdgrp/getpwuid.c
+++ b/libpwdgrp/getpwuid.c
@@ -30,7 +30,7 @@ struct passwd *getpwuid(uid_t uid)
         int passwd_fd;
         struct passwd *passwd;
 
-        if ((passwd_fd = open("/etc/passwd", O_RDONLY)) < 0)
+        if ((passwd_fd = open(bb_path_passwd_file, O_RDONLY)) < 0)
                 return NULL;
 
         while ((passwd = __getpwent(passwd_fd)) != NULL)
diff --git a/libpwdgrp/grent.c b/libpwdgrp/grent.c
index df9195599..609ed1a46 100644
--- a/libpwdgrp/grent.c
+++ b/libpwdgrp/grent.c
@@ -36,7 +36,7 @@ void setgrent(void)
 {
         if (grp_fd != -1)
                 close(grp_fd);
-        grp_fd = open("/etc/group", O_RDONLY);
+        grp_fd = open(bb_path_group_file, O_RDONLY);
 }
 
 void endgrent(void)
diff --git a/libpwdgrp/initgroups.c b/libpwdgrp/initgroups.c
index f86b5a8f4..ce63adb18 100644
--- a/libpwdgrp/initgroups.c
+++ b/libpwdgrp/initgroups.c
@@ -79,7 +79,7 @@ int initgroups(__const char *user, gid_t gid)
         int grp_fd;
 
 
-        if ((grp_fd = open("/etc/group", O_RDONLY)) < 0)
+        if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
                 return -1;
 
         num_groups = 0;
diff --git a/libpwdgrp/pwent.c b/libpwdgrp/pwent.c
index 4a80093e8..f7f8581f3 100644
--- a/libpwdgrp/pwent.c
+++ b/libpwdgrp/pwent.c
@@ -40,7 +40,7 @@ void setpwent(void)
         if (pw_fd != -1)
                 close(pw_fd);
 
-        pw_fd = open("/etc/passwd", O_RDONLY);
+        pw_fd = open(bb_path_passwd_file, O_RDONLY);
 }
 
 void endpwent(void)