CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-03 22:29:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix nmap_fetchfile_userdir for non-Windows.

Browse source
This commit is contained in:
david 2011-12-20 21:21:44 +00:00
parent 5d362169f2
commit 08b5d81db5
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nmap.cc
View file

@ -2866,8 +2866,8 @@ static int nmap_fetchfile_userdir_uid(char *buf, size_t buflen,
pw = getpwuid(uid);
if (pw == NULL)
return 0;
res = Snprintf(buf, buflen, "%s/.nmap/%s", ps->pw_dir, file);
if (res <= 0 || res >= buflen)
res = Snprintf(buf, buflen, "%s/.nmap/%s", pw->pw_dir, file);
if (res <= 0 || (size_t) res >= buflen)
return 0;
return fileexistsandisreadable(buf);
@ -2877,12 +2877,12 @@ static int nmap_fetchfile_userdir(char *buf, size_t buflen,
const char *file) {
int res;
res = nmap_fetchfile_userdir_uid(buf, buflen, getuid());
res = nmap_fetchfile_userdir_uid(buf, buflen, file, getuid());
if (res != 0)
return res;
if (getuid() != geteuid()) {
res = nmap_fetchfile_userdir_uid(buf, buflen, geteuid());
res = nmap_fetchfile_userdir_uid(buf, buflen, file, geteuid());
if (res != 0)
return res;
}