- rename libbb's password helpers as suggested in libbb.h

  my_getpwnam -> bb_xgetpwnam  /* dies on error */
  my_getgrnam -> bb_xgetgrnam  /* dies on error */
  my_getgrgid -> bb_getgrgid
  my_getpwuid -> bb_getpwuid
  my_getug    -> bb_getug

2 files changed, 2 insertions, 2 deletions

diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 7fa05a013..eb9890168 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -305,7 +305,7 @@ int adduser_main(int argc, char **argv)
 
         if (usegroup) {
                 /* Add user to a group that already exists */
-                pw.pw_gid = my_getgrnam(usegroup);
+                pw.pw_gid = bb_xgetgrnam(usegroup);
                 /* exits on error */    
         }
 
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index c8940eed7..5d8380d4c 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -168,7 +168,7 @@ extern int passwd_main(int argc, char **argv)
                         bb_show_usage();
                 }
         }
-        myname = (char *) bb_xstrdup(my_getpwuid(NULL, getuid(), -1));
+        myname = (char *) bb_xstrdup(bb_getpwuid(NULL, getuid(), -1));
         /* exits on error */
         if (optind < argc) {
                 name = argv[optind];