isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up netgr_matches

Browse Source
This commit is contained in:
Todd C. Miller
1995-07-27 01:29:59 +00:00
parent d08b4b9f1e
commit 178e4a3c10
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
parse.c
View File

@@ -248,11 +248,10 @@ netgr_matches(netgr, host, user)
char *host; char *host;
char *user; char *user;
{ {
/* XXX - all these statics make me want to puke! */
static char *domain = NULL;
#ifdef HAVE_GETDOMAINNAME #ifdef HAVE_GETDOMAINNAME
static int firsttime = 1; static char *domain = (char *) -1;
static char d[MAXHOSTNAMELEN]; #else
static char *domain = NULL;
#endif /* HAVE_GETDOMAINNAME */ #endif /* HAVE_GETDOMAINNAME */
/* make sure we have a valid netgroup, sudo style */ /* make sure we have a valid netgroup, sudo style */
@@ -261,10 +260,17 @@ netgr_matches(netgr, host, user)
#ifdef HAVE_GETDOMAINNAME #ifdef HAVE_GETDOMAINNAME
/* get the domain name (if any) */ /* get the domain name (if any) */
if (firsttime) { if (domain == (char *) -1) {
firsttime = 0; if ((domain = (char *) malloc(MAXHOSTNAMELEN + 1)) == NULL) {
if (getdomainname(d, sizeof(d)) == 0 && d[0]) perror("malloc");
domain = d; (void) fprintf(stderr, "%s: cannot allocate memory!\n", Argv[0]);
exit(1);
}
if (getdomainname(domain, MAXHOSTNAMELEN + 1) != 0 || *domain == '\0') {
(void) free(domain);
domain = NULL;
}
} }
#endif /* HAVE_GETDOMAINNAME */ #endif /* HAVE_GETDOMAINNAME */