summaryrefslogtreecommitdiff
path: root/libpwdgrp
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-07-26 07:48:13 +0000
committerEric Andersen <andersen@codepoet.org>2003-07-26 07:48:13 +0000
commitef73d3b5d9e9d5124b7c16bd77097fae3f200616 (patch)
treeac5a3d543cdd164a4aa2839abcfeb662de018a0d /libpwdgrp
parent7d72e796d6362872fe0075f936589bba23124344 (diff)
downloadbusybox-w32-ef73d3b5d9e9d5124b7c16bd77097fae3f200616.tar.gz
busybox-w32-ef73d3b5d9e9d5124b7c16bd77097fae3f200616.tar.bz2
busybox-w32-ef73d3b5d9e9d5124b7c16bd77097fae3f200616.zip
Patch from Nick Fedchik to fixup paths in busybox/libpwdgrp
which were not properly using the bb_path_*_file strings.
Diffstat (limited to 'libpwdgrp')
-rw-r--r--libpwdgrp/getgrgid.c2
-rw-r--r--libpwdgrp/getgrnam.c2
-rw-r--r--libpwdgrp/getpwnam.c2
-rw-r--r--libpwdgrp/getpwuid.c2
-rw-r--r--libpwdgrp/grent.c2
-rw-r--r--libpwdgrp/initgroups.c2
-rw-r--r--libpwdgrp/pwent.c2
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)
30 struct group *group; 30 struct group *group;
31 int grp_fd; 31 int grp_fd;
32 32
33 if ((grp_fd = open("/etc/group", O_RDONLY)) < 0) 33 if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
34 return NULL; 34 return NULL;
35 35
36 while ((group = __getgrent(grp_fd)) != NULL) 36 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)
36 return NULL; 36 return NULL;
37 } 37 }
38 38
39 if ((grp_fd = open("/etc/group", O_RDONLY)) < 0) 39 if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
40 return NULL; 40 return NULL;
41 41
42 while ((group = __getgrent(grp_fd)) != NULL) 42 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)
37 return NULL; 37 return NULL;
38 } 38 }
39 39
40 if ((passwd_fd = open("/etc/passwd", O_RDONLY)) < 0) 40 if ((passwd_fd = open(bb_path_passwd_file, O_RDONLY)) < 0)
41 return NULL; 41 return NULL;
42 42
43 while ((passwd = __getpwent(passwd_fd)) != NULL) 43 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)
30 int passwd_fd; 30 int passwd_fd;
31 struct passwd *passwd; 31 struct passwd *passwd;
32 32
33 if ((passwd_fd = open("/etc/passwd", O_RDONLY)) < 0) 33 if ((passwd_fd = open(bb_path_passwd_file, O_RDONLY)) < 0)
34 return NULL; 34 return NULL;
35 35
36 while ((passwd = __getpwent(passwd_fd)) != NULL) 36 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)
36{ 36{
37 if (grp_fd != -1) 37 if (grp_fd != -1)
38 close(grp_fd); 38 close(grp_fd);
39 grp_fd = open("/etc/group", O_RDONLY); 39 grp_fd = open(bb_path_group_file, O_RDONLY);
40} 40}
41 41
42void endgrent(void) 42void 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)
79 int grp_fd; 79 int grp_fd;
80 80
81 81
82 if ((grp_fd = open("/etc/group", O_RDONLY)) < 0) 82 if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
83 return -1; 83 return -1;
84 84
85 num_groups = 0; 85 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)
40 if (pw_fd != -1) 40 if (pw_fd != -1)
41 close(pw_fd); 41 close(pw_fd);
42 42
43 pw_fd = open("/etc/passwd", O_RDONLY); 43 pw_fd = open(bb_path_passwd_file, O_RDONLY);
44} 44}
45 45
46void endpwent(void) 46void endpwent(void)