From 2d7d05f031e014068a61d3076c6178513395d2ae Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 15 Jun 2017 13:01:34 -0400 Subject: set errno when getpw*_r, getgr*_r, and getspnam_r fail these functions return an error code, and are not explicitly documented to set errno, but they are nonstandard and the historical implementations do set errno as well, and some applications expect this behavior. do likewise for compatibility. patch by Rudolph Pereira. --- src/passwd/getspnam_r.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/passwd/getspnam_r.c') diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c index 92339528..e488b67f 100644 --- a/src/passwd/getspnam_r.c +++ b/src/passwd/getspnam_r.c @@ -72,14 +72,15 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct /* Disallow potentially-malicious user names */ if (*name=='.' || strchr(name, '/') || !l) - return EINVAL; + return errno = EINVAL; /* Buffer size must at least be able to hold name, plus some.. */ - if (size < l+100) return ERANGE; + if (size < l+100) + return errno = EINVAL; /* Protect against truncation */ if (snprintf(path, sizeof path, "/etc/tcb/%s/shadow", name) >= sizeof path) - return EINVAL; + return errno = EINVAL; fd = open(path, O_RDONLY|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC); if (fd >= 0) { @@ -112,5 +113,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct break; } pthread_cleanup_pop(1); + if (rv) errno = rv; return rv; } -- cgit 1.4.1