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

Actually use the check for prior initialization in sudo_getdomainname().

Browse Source
This commit is contained in:
Todd C. Miller
2015-02-02 15:38:03 -07:00
parent 109a866fb5
commit 15717c518e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/sudoers/match.c
View File

@@ -916,19 +916,21 @@ sudo_getdomainname(void)
static char buf[HOST_NAME_MAX + 1]; static char buf[HOST_NAME_MAX + 1];
static bool initialized; static bool initialized;
if (getdomainname(buf, sizeof(buf)) == 0 && buf[0] != '\0') { if (!initialized) {
char *cp; if (getdomainname(buf, sizeof(buf)) == 0 && buf[0] != '\0') {
char *cp;
domain = buf; domain = buf;
for (cp = buf; *cp != '\0'; cp++) { for (cp = buf; *cp != '\0'; cp++) {
/* Check for illegal characters, Linux may use "(none)". */ /* Check for illegal characters, Linux may use "(none)". */
if (*cp == '(' || *cp == ')' || *cp == ',' || *cp == ' ') { if (*cp == '(' || *cp == ')' || *cp == ',' || *cp == ' ') {
domain = NULL; domain = NULL;
break; break;
}
} }
} }
initialized = true;
} }
initialized = true;
#endif /* HAVE_GETDOMAINNAME */ #endif /* HAVE_GETDOMAINNAME */
return domain; return domain;
} }