diff options
author | grant <grant@pkgsrc.org> | 2003-06-23 11:49:51 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2003-06-23 11:49:51 +0000 |
commit | dee7f2ff36770ddbac7717e045226d418d70d7ef (patch) | |
tree | 2c957368d5efaf88081a51aa1e3528666bb4caeb /pkgtools | |
parent | 238191b30b4fa7a7b7be57f802e939f9eba1af2a (diff) | |
download | pkgsrc-dee7f2ff36770ddbac7717e045226d418d70d7ef.tar.gz |
remove old pax package (moved to archivers/pax).
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/Makefile | 3 | ||||
-rw-r--r-- | pkgtools/pax/DESCR | 1 | ||||
-rw-r--r-- | pkgtools/pax/Makefile | 24 | ||||
-rw-r--r-- | pkgtools/pax/PLIST | 4 | ||||
-rw-r--r-- | pkgtools/pax/distinfo | 6 | ||||
-rw-r--r-- | pkgtools/pax/files/pwcache.c | 519 | ||||
-rw-r--r-- | pkgtools/pax/files/pwcache.h | 76 | ||||
-rw-r--r-- | pkgtools/pax/patches/patch-aa | 15 | ||||
-rw-r--r-- | pkgtools/pax/patches/patch-ab | 80 |
9 files changed, 1 insertions, 727 deletions
diff --git a/pkgtools/Makefile b/pkgtools/Makefile index ec4d04547d9..7a68acd6c16 100644 --- a/pkgtools/Makefile +++ b/pkgtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2003/06/19 16:09:20 grant Exp $ +# $NetBSD: Makefile,v 1.50 2003/06/23 11:49:51 grant Exp $ # COMMENT= Tools for use in the packages collection @@ -12,7 +12,6 @@ SUBDIR+= distfetch SUBDIR+= gensolpkg #SUBDIR+= libnbcompat # Only for non-NetBSD systems #SUBDIR+= mtree # Only for non-NetBSD systems -#SUBDIR+= pax # Only needed on 1.3 systems SUBDIR+= pkg_comp #SUBDIR+= pkg_install # Only install on demand of bsd.pkg.mk SUBDIR+= pkg_install-info diff --git a/pkgtools/pax/DESCR b/pkgtools/pax/DESCR deleted file mode 100644 index 6a51fbe5236..00000000000 --- a/pkgtools/pax/DESCR +++ /dev/null @@ -1 +0,0 @@ -NetBSD pax is the POSIX standard archiver with many extensions. diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile deleted file mode 100644 index f8e2412b8af..00000000000 --- a/pkgtools/pax/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.9 2003/06/02 01:17:34 jschauma Exp $ -# - -DISTNAME= pax-19980903 -PKGNAME= pax-19990423 -WRKSRC= ${WRKDIR}/pax -CATEGORIES= pkgtools -MASTER_SITES= ${MASTER_SITE_LOCAL} - -MAINTAINER= tech-pkg@netbsd.org -HOMEPAGE= http://www.netbsd.org/ -COMMENT= Standard POSIX portable archiver - -PREFIX= / -MAKE_ENV+= BINDIR=/bin MANDIR=/usr/share/man -NO_PKG_REGISTER= yes -NO_PACKAGE= No package registration is done -MANCOMPRESSED_IF_MANZ= yes - -post-extract: - ${GREP} -v __RCSID ${FILESDIR}/pwcache.c >${WRKSRC}/pwcache.c - ${CP} ${FILESDIR}/pwcache.h ${WRKSRC} - -.include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pax/PLIST b/pkgtools/pax/PLIST deleted file mode 100644 index 4c60b6a4f19..00000000000 --- a/pkgtools/pax/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:19:03 zuntum Exp $ -bin/pax -man/man1/pax.1 -man/cat1/pax.0 diff --git a/pkgtools/pax/distinfo b/pkgtools/pax/distinfo deleted file mode 100644 index f26c1be885b..00000000000 --- a/pkgtools/pax/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.1 2001/04/17 12:19:48 agc Exp $ - -SHA1 (pax-19980903.tar.gz) = dbbc6672b86ec4d371cda997bf40e64aa6cab0d1 -Size (pax-19980903.tar.gz) = 107929 bytes -SHA1 (patch-aa) = e9674773062b4a1460cbaae6a17470cae842d74d -SHA1 (patch-ab) = bdce9379355a311753b9b18c3a711073fad7914d diff --git a/pkgtools/pax/files/pwcache.c b/pkgtools/pax/files/pwcache.c deleted file mode 100644 index 14050dec308..00000000000 --- a/pkgtools/pax/files/pwcache.c +++ /dev/null @@ -1,519 +0,0 @@ -/* $NetBSD: pwcache.c,v 1.1 1999/04/23 13:37:24 hubertf Exp $ */ - -/*- - * Copyright (c) 1992 Keith Muller. - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -#ifndef lint -#if 0 -static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; -#else -__RCSID("$NetBSD: pwcache.c,v 1.1 1999/04/23 13:37:24 hubertf Exp $"); -#endif -#endif /* not lint */ - -#include "namespace.h" - -#include <sys/types.h> -#include <sys/param.h> - -#include <grp.h> -#include <pwd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include "pwcache.h" - -#ifdef __weak_alias -__weak_alias(user_from_uid,_user_from_uid); -__weak_alias(group_from_gid,_group_from_gid); -#endif - -/* - * routines that control user, group, uid and gid caches (for the archive - * member print routine). - * IMPORTANT: - * these routines cache BOTH hits and misses, a major performance improvement - */ - -static int pwopn = 0; /* is password file open */ -static int gropn = 0; /* is group file open */ -static UIDC **uidtb = NULL; /* uid to name cache */ -static GIDC **gidtb = NULL; /* gid to name cache */ -static UIDC **usrtb = NULL; /* user name to uid cache */ -static GIDC **grptb = NULL; /* group name to gid cache */ - -static u_int st_hash __P((const char *, size_t, int)); -static int uidtb_start __P((void)); -static int gidtb_start __P((void)); -static int usrtb_start __P((void)); -static int grptb_start __P((void)); - -static u_int -st_hash(name, len, tabsz) - const char *name; - size_t len; - int tabsz; -{ - u_int key = 0; - - while (len--) { - key += *name++; - key = (key << 8) | (key >> 24); - } - - return (key % tabsz); -} - -/* - * uidtb_start - * creates an an empty uidtb - * Return: - * 0 if ok, -1 otherwise - */ - -#if __STDC__ -static int -uidtb_start(void) -#else -static int -uidtb_start() -#endif -{ - static int fail = 0; - - if (uidtb != NULL) - return (0); - if (fail) - return (-1); - if ((uidtb = (UIDC **)calloc(UID_SZ, sizeof(UIDC *))) == NULL) { - ++fail; - return (-1); - } - return (0); -} - -/* - * gidtb_start - * creates an an empty gidtb - * Return: - * 0 if ok, -1 otherwise - */ - -#if __STDC__ -int -gidtb_start(void) -#else -int -gidtb_start() -#endif -{ - static int fail = 0; - - if (gidtb != NULL) - return (0); - if (fail) - return (-1); - if ((gidtb = (GIDC **)calloc(GID_SZ, sizeof(GIDC *))) == NULL) { - ++fail; - return (-1); - } - return (0); -} - -/* - * usrtb_start - * creates an an empty usrtb - * Return: - * 0 if ok, -1 otherwise - */ - -#if __STDC__ -int -usrtb_start(void) -#else -int -usrtb_start() -#endif -{ - static int fail = 0; - - if (usrtb != NULL) - return (0); - if (fail) - return (-1); - if ((usrtb = (UIDC **)calloc(UNM_SZ, sizeof(UIDC *))) == NULL) { - ++fail; - return (-1); - } - return (0); -} - -/* - * grptb_start - * creates an an empty grptb - * Return: - * 0 if ok, -1 otherwise - */ - -#if __STDC__ -int -grptb_start(void) -#else -int -grptb_start() -#endif -{ - static int fail = 0; - - if (grptb != NULL) - return (0); - if (fail) - return (-1); - if ((grptb = (GIDC **)calloc(GNM_SZ, sizeof(GIDC *))) == NULL) { - ++fail; - return (-1); - } - return (0); -} - -/* - * user_from_uid() - * caches the name (if any) for the uid. If noname clear, we always return the - * the stored name (if valid or invalid match). We use a simple hash table. - * Return - * Pointer to stored name (or a empty string) - */ - -#if __STDC__ -const char * -user_from_uid(uid_t uid, int noname) -#else -const char * -user_from_uid(uid, noname) - uid_t uid; - int noname; -#endif -{ - struct passwd *pw; - UIDC *ptr, **pptr; - - if ((uidtb == NULL) && (uidtb_start() < 0)) - return (NULL); - - /* - * see if we have this uid cached - */ - pptr = uidtb + (uid % UID_SZ); - ptr = *pptr; - - if ((ptr != NULL) && (ptr->valid > 0) && (ptr->uid == uid)) { - /* - * have an entry for this uid - */ - if (!noname || (ptr->valid == VALID)) - return (ptr->name); - return (NULL); - } - - /* - * No entry for this uid, we will add it - */ - if (!pwopn) { - setpassent(1); - ++pwopn; - } - - if (ptr == NULL) - *pptr = ptr = (UIDC *)malloc(sizeof(UIDC)); - - if ((pw = getpwuid(uid)) == NULL) { - /* - * no match for this uid in the local password file - * a string that is the uid in numberic format - */ - if (ptr == NULL) - return (NULL); - ptr->uid = uid; -# ifdef NET2_STAT - (void)snprintf(ptr->name, UNMLEN, "%u", uid); -# else - (void)snprintf(ptr->name, UNMLEN, "%lu", (long) uid); -# endif - ptr->valid = INVALID; - if (noname) - return (NULL); - } else { - /* - * there is an entry for this uid in the password file - */ - if (ptr == NULL) - return (pw->pw_name); - ptr->uid = uid; - (void)strncpy(ptr->name, pw->pw_name, UNMLEN); - ptr->name[UNMLEN-1] = '\0'; - ptr->valid = VALID; - } - return (ptr->name); -} - -/* - * group_from_gid() - * caches the name (if any) for the gid. If noname clear, we always return the - * the stored name (if valid or invalid match). We use a simple hash table. - * Return - * Pointer to stored name (or a empty string) - */ - -#if __STDC__ -const char * -group_from_gid(gid_t gid, int noname) -#else -const char * -group_from_gid(gid, noname) - gid_t gid; - int noname; -#endif -{ - struct group *gr; - GIDC *ptr, **pptr; - - if ((gidtb == NULL) && (gidtb_start() < 0)) - return (NULL); - - /* - * see if we have this gid cached - */ - pptr = gidtb + (gid % GID_SZ); - ptr = *pptr; - - if ((ptr != NULL) && (ptr->valid > 0) && (ptr->gid == gid)) { - /* - * have an entry for this gid - */ - if (!noname || (ptr->valid == VALID)) - return (ptr->name); - return (NULL); - } - - /* - * No entry for this gid, we will add it - */ - if (!gropn) { - setgroupent(1); - ++gropn; - } - - if (ptr == NULL) - *pptr = ptr = (GIDC *)malloc(sizeof(GIDC)); - - if ((gr = getgrgid(gid)) == NULL) { - /* - * no match for this gid in the local group file, put in - * a string that is the gid in numberic format - */ - if (ptr == NULL) - return (NULL); - ptr->gid = gid; -# ifdef NET2_STAT - (void)snprintf(ptr->name, GNMLEN, "%u", gid); -# else - (void)snprintf(ptr->name, GNMLEN, "%lu", (long) gid); -# endif - ptr->valid = INVALID; - if (noname) - return (NULL); - } else { - /* - * there is an entry for this group in the group file - */ - if (ptr == NULL) - return (gr->gr_name); - ptr->gid = gid; - (void)strncpy(ptr->name, gr->gr_name, GNMLEN); - ptr->name[GNMLEN-1] = '\0'; - ptr->valid = VALID; - } - return (ptr->name); -} - -/* - * uid_from_user() - * caches the uid for a given user name. We use a simple hash table. - * Return - * the uid (if any) for a user name, or a -1 if no match can be found - */ - -#if __STDC__ -int -uid_from_user(const char *name, uid_t *uid) -#else -int -uid_from_user(name, uid) - const char *name; - uid_t *uid; -#endif -{ - struct passwd *pw; - UIDC *ptr, **pptr; - size_t namelen; - - /* - * return -1 for mangled names - */ - if (((namelen = strlen(name)) == 0) || (name[0] == '\0')) - return (-1); - if ((usrtb == NULL) && (usrtb_start() < 0)) - return (-1); - - /* - * look up in hash table, if found and valid return the uid, - * if found and invalid, return a -1 - */ - pptr = usrtb + st_hash(name, namelen, UNM_SZ); - ptr = *pptr; - - if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) { - if (ptr->valid == INVALID) - return (-1); - *uid = ptr->uid; - return (0); - } - - if (!pwopn) { - setpassent(1); - ++pwopn; - } - - if (ptr == NULL) - *pptr = ptr = (UIDC *)malloc(sizeof(UIDC)); - - /* - * no match, look it up, if no match store it as an invalid entry, - * or store the matching uid - */ - if (ptr == NULL) { - if ((pw = getpwnam(name)) == NULL) - return (-1); - *uid = pw->pw_uid; - return (0); - } - (void)strncpy(ptr->name, name, UNMLEN); - ptr->name[UNMLEN-1] = '\0'; - if ((pw = getpwnam(name)) == NULL) { - ptr->valid = INVALID; - return (-1); - } - ptr->valid = VALID; - *uid = ptr->uid = pw->pw_uid; - return (0); -} - -/* - * gid_from_group() - * caches the gid for a given group name. We use a simple hash table. - * Return - * the gid (if any) for a group name, or a -1 if no match can be found - */ - -#if __STDC__ -int -gid_from_group(const char *name, gid_t *gid) -#else -int -gid_from_group(name, gid) - const char *name; - gid_t *gid; -#endif -{ - struct group *gr; - GIDC *ptr, **pptr; - size_t namelen; - - /* - * return -1 for mangled names - */ - if (((namelen = strlen(name)) == 0) || (name[0] == '\0')) - return (-1); - if ((grptb == NULL) && (grptb_start() < 0)) - return (-1); - - /* - * look up in hash table, if found and valid return the uid, - * if found and invalid, return a -1 - */ - pptr = grptb + st_hash(name, namelen, GID_SZ); - ptr = *pptr; - - if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) { - if (ptr->valid == INVALID) - return (-1); - *gid = ptr->gid; - return (0); - } - - if (!gropn) { - setgroupent(1); - ++gropn; - } - - if (ptr == NULL) - *pptr = ptr = (GIDC *)malloc(sizeof(GIDC)); - - /* - * no match, look it up, if no match store it as an invalid entry, - * or store the matching gid - */ - if (ptr == NULL) { - if ((gr = getgrnam(name)) == NULL) - return (-1); - *gid = gr->gr_gid; - return (0); - } - - (void)strncpy(ptr->name, name, GNMLEN); - ptr->name[GNMLEN-1] = '\0'; - if ((gr = getgrnam(name)) == NULL) { - ptr->valid = INVALID; - return (-1); - } - ptr->valid = VALID; - *gid = ptr->gid = gr->gr_gid; - return (0); -} diff --git a/pkgtools/pax/files/pwcache.h b/pkgtools/pax/files/pwcache.h deleted file mode 100644 index 42c96600313..00000000000 --- a/pkgtools/pax/files/pwcache.h +++ /dev/null @@ -1,76 +0,0 @@ -/* $NetBSD: pwcache.h,v 1.1 1999/04/23 13:37:24 hubertf Exp $ */ - -/*- - * Copyright (c) 1992 Keith Muller. - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)cache.h 8.1 (Berkeley) 5/31/93 - */ - -/* - * Constants and data structures used to implement group and password file - * caches. Traditional passwd/group cache routines perform quite poorly with - * archives. The chances of hitting a valid lookup with an archive is quite a - * bit worse than with files already resident on the file system. These misses - * create a MAJOR performance cost. To adress this problem, these routines - * cache both hits and misses. - * - * NOTE: name lengths must be as large as those stored in ANY PROTOCOL and - * as stored in the passwd and group files. CACHE SIZES MUST BE PRIME - */ -#define UNMLEN 32 /* >= user name found in any protocol */ -#define GNMLEN 32 /* >= group name found in any protocol */ -#define UID_SZ 317 /* size of user_name/uid cache */ -#define UNM_SZ 317 /* size of user_name/uid cache */ -#define GID_SZ 251 /* size of group_name/gid cache */ -#define GNM_SZ 251 /* size of group_name/gid cache */ -#define VALID 1 /* entry and name are valid */ -#define INVALID 2 /* entry valid, name NOT valid */ - -/* - * Node structures used in the user, group, uid, and gid caches. - */ - -typedef struct uidc { - int valid; /* is this a valid or a miss entry */ - char name[UNMLEN]; /* uid name */ - uid_t uid; /* cached uid */ -} UIDC; - -typedef struct gidc { - int valid; /* is this a valid or a miss entry */ - char name[GNMLEN]; /* gid name */ - gid_t gid; /* cached gid */ -} GIDC; diff --git a/pkgtools/pax/patches/patch-aa b/pkgtools/pax/patches/patch-aa deleted file mode 100644 index f2114b6149c..00000000000 --- a/pkgtools/pax/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2000/01/10 01:03:35 wiz Exp $ - -Needed for 1.3 - ---- tar.c.BAK Fri Apr 23 15:27:46 1999 -+++ tar.c Fri Apr 23 15:31:40 1999 -@@ -63,6 +63,8 @@ - #include "extern.h" - #include "tar.h" - -+#include "pwcache.c" -+ - /* - * Routines for reading, writing and header identify of various versions of tar - */ diff --git a/pkgtools/pax/patches/patch-ab b/pkgtools/pax/patches/patch-ab deleted file mode 100644 index c1a936a0516..00000000000 --- a/pkgtools/pax/patches/patch-ab +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/04/23 13:47:44 hubertf Exp $ - ---- ../pwcache.c Fri Apr 23 15:46:31 1999 -+++ pwcache.c Fri Apr 23 15:54:27 1999 -@@ -46,7 +46,7 @@ - #endif - #endif /* not lint */ - --#include "namespace.h" -+/* #include "namespace.h" *//*HF*/ - - #include <sys/types.h> - #include <sys/param.h> -@@ -79,12 +79,13 @@ - static UIDC **usrtb = NULL; /* user name to uid cache */ - static GIDC **grptb = NULL; /* group name to gid cache */ - --static u_int st_hash __P((const char *, size_t, int)); -+/* static u_int st_hash __P((const char *, size_t, int)); *//*HF*/ - static int uidtb_start __P((void)); - static int gidtb_start __P((void)); - static int usrtb_start __P((void)); - static int grptb_start __P((void)); - -+#if 0 - static u_int - st_hash(name, len, tabsz) - const char *name; -@@ -100,6 +101,7 @@ - - return (key % tabsz); - } -+#endif - - /* - * uidtb_start -@@ -213,6 +215,7 @@ - return (0); - } - -+#if 0 - /* - * user_from_uid() - * caches the name (if any) for the uid. If noname clear, we always return the -@@ -292,7 +295,9 @@ - } - return (ptr->name); - } -+#endif - -+#if 0 - /* - * group_from_gid() - * caches the name (if any) for the gid. If noname clear, we always return the -@@ -372,6 +377,7 @@ - } - return (ptr->name); - } -+#endif - - /* - * uid_from_user() -@@ -406,7 +412,7 @@ - * look up in hash table, if found and valid return the uid, - * if found and invalid, return a -1 - */ -- pptr = usrtb + st_hash(name, namelen, UNM_SZ); -+ pptr = usrtb + st_hash((char *)name, namelen, UNM_SZ); - ptr = *pptr; - - if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) { -@@ -478,7 +484,7 @@ - * look up in hash table, if found and valid return the uid, - * if found and invalid, return a -1 - */ -- pptr = grptb + st_hash(name, namelen, GID_SZ); -+ pptr = grptb + st_hash((char *)name, namelen, GID_SZ); - ptr = *pptr; - - if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) { |