- 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, 4 insertions, 4 deletions

diff --git a/archival/rpm.c b/archival/rpm.c
index fa8db539a..9d16567bc 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -331,8 +331,8 @@ void fileaction_dobackup(char *filename, int fileref)
 void fileaction_setowngrp(char *filename, int fileref)
 {
         int uid, gid;
-        uid = my_getpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref));
-        gid = my_getgrnam(rpm_getstring(RPMTAG_FILEGROUPNAME, fileref));
+        uid = bb_xgetpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref));
+        gid = bb_xgetgrnam(rpm_getstring(RPMTAG_FILEGROUPNAME, fileref));
         chown (filename, uid, gid);
 }
 
diff --git a/archival/tar.c b/archival/tar.c
index a2623863d..7a82b441b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -234,9 +234,9 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo,
                         TAR_MAGIC_LEN + TAR_VERSION_LEN);
 
         /* Enter the user and group names (default to root if it fails) */
-        if (my_getpwuid(header.uname, statbuf->st_uid, sizeof(header.uname)) == NULL)
+        if (bb_getpwuid(header.uname, statbuf->st_uid, sizeof(header.uname)) == NULL)
                 strcpy(header.uname, "root");
-        if (my_getgrgid(header.gname, statbuf->st_gid, sizeof(header.gname)) == NULL)
+        if (bb_getgrgid(header.gname, statbuf->st_gid, sizeof(header.gname)) == NULL)
                 strcpy(header.gname, "root");
 
         if (tbInfo->hlInfo) {