aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ginda <rginda@chromium.org>2015-08-20 14:47:20 -0700
committerRobert Ginda <rginda@chromium.org>2015-08-20 14:47:20 -0700
commitbc61af047438cd9d9c8d38e3ce9ec95e3f2b7d32 (patch)
tree0f44272176f12a23d1392cc0f7d76b7c3c8e7813
parent00d0b8b8bb3b5a1d7ced7654d86fc19ec78e51dc (diff)
downloadavahi-bc61af047438cd9d9c8d38e3ce9ec95e3f2b7d32.tar.gz
Disable tilde expansion on BIONIC
The issetugid function isn't defined in bionic, and we don't need it for avahi anyway. Change-Id: I427fd8f0a932618ea9a9672cc71e964ad0710ae4
-rw-r--r--avahi-daemon/glob.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/avahi-daemon/glob.c b/avahi-daemon/glob.c
index 20e253f..7819279 100644
--- a/avahi-daemon/glob.c
+++ b/avahi-daemon/glob.c
@@ -396,6 +396,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
* we're not running setuid or setgid) and then trying
* the password file
*/
+#ifndef __BIONIC__
if (issetugid() != 0 ||
(h = getenv("HOME")) == NULL) {
if (((h = getlogin()) != NULL &&
@@ -405,6 +406,7 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
else
return pattern;
}
+#endif
}
else {
/*