From 08b5d81db5d5300d5ae86a734c087ad90b048183 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 20 Dec 2011 21:21:44 +0000
Subject: [PATCH] Fix nmap_fetchfile_userdir for non-Windows.

---
 nmap.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nmap.cc b/nmap.cc
index 46148809c..a5bbedd84 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -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;
   }