From b18df4d50ab6512c177374d934e9edb0fe27340e Mon Sep 17 00:00:00 2001
From: djalal <djalal@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 31 Oct 2010 18:29:15 +0000
Subject: [PATCH] Make functions that call Helper.GetProgramInfo() return a
 string message on errors.

---
 nselib/rpc.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nselib/rpc.lua b/nselib/rpc.lua
index df2da35d2..773570df2 100644
--- a/nselib/rpc.lua
+++ b/nselib/rpc.lua
@@ -2285,8 +2285,8 @@ Helper = {
 
     status, mountd = Helper.GetProgramInfo( host, port, "mountd")
     if not status then
-      stdnse.print_debug(1, "rpc.Helper.MountPath: %s", mountd)
-      return nil, mountd
+      stdnse.print_debug(4, "rpc.Helper.MountPath: GetProgramInfo failed")
+      return nil, "rpc.Helper.MountPath: GetProgramInfo failed"
     end
 
     mnt_comm = Comm:new("mountd", mountd.version)
@@ -2346,8 +2346,8 @@ Helper = {
 
     status, nfsd = Helper.GetProgramInfo(host, port, "nfs")
     if not status then
-      stdnse.print_debug(4, "rpc.Helper.NfsProc: %s", nfsd)
-      return nil, nfsd
+      stdnse.print_debug(4, "rpc.Helper.NfsOpen: GetProgramInfo failed")
+      return nil, "rpc.Helper.NfsOpen: GetProgramInfo failed"
     end
 
     nfs_comm = Comm:new('nfs', nfsd.version)
@@ -2396,14 +2396,14 @@ Helper = {
   
     status, mountd = Helper.GetProgramInfo( host, port, "mountd", 2)
     if ( not(status) ) then
-      stdnse.print_debug(4, "rpc.Helper.ExportStats: %s", mountd)
-      return status, mountd
+      stdnse.print_debug(4, "rpc.Helper.ExportStats: GetProgramInfo failed")
+      return status, "rpc.Helper.ExportStats: GetProgramInfo failed"
     end
 
     status, nfsd = Helper.GetProgramInfo( host, port, "nfs", 2)
     if ( not(status) ) then
-      stdnse.print_debug(4, "rpc.Helper.ExportStats: %s", nfsd)
-      return status, nfsd
+      stdnse.print_debug(4, "rpc.Helper.ExportStats: GetProgramInfo failed")
+      return status, "rpc.Helper.ExportStats: GetProgramInfo failed"
     end
     mnt_comm = Comm:new('mountd', mountd.version)
     nfs_comm = Comm:new('nfs', nfsd.version)
@@ -2468,14 +2468,14 @@ Helper = {
 
     status, mountd = Helper.GetProgramInfo( host, port, "mountd")
     if ( not(status) ) then
-      stdnse.print_debug(4, "rpc.Helper.Dir: %s", mountd)
-      return status, mountd
+      stdnse.print_debug(4, "rpc.Helper.Dir: GetProgramInfo failed")
+      return status, "rpc.Helper.Dir: GetProgramInfo failed"
     end
 
     status, nfsd = Helper.GetProgramInfo( host, port, "nfs")
     if ( not(status) ) then
-      stdnse.print_debug(4, "rpc.Helper.Dir: %s", nfsd)
-      return status, nfsd
+      stdnse.print_debug(4, "rpc.Helper.Dir: GetProgramInfo failed")
+      return status, "rpc.Helper.Dir: GetProgramInfo failed"
     end
 
     mnt_comm = Comm:new('mountd', mountd.version)
@@ -2544,14 +2544,14 @@ Helper = {
 
     status, mountd = Helper.GetProgramInfo( host, port, "mountd")
     if ( not(status) ) then
-      stdnse.print_debug(4, "rpc.Helper.GetAttributes: %s", mountd)
-      return status, mountd
+      stdnse.print_debug(4, "rpc.Helper.GetAttributes: GetProgramInfo failed")
+      return status, "rpc.Helper.GetAttributes: GetProgramInfo failed"
     end
 
     status, nfsd = Helper.GetProgramInfo( host, port, "nfs")
     if ( not(status) ) then
-      stdnse.print_debug(4, "rpc.Helper.GetAttributes: %s", nfsd)
-      return status, nfsd
+      stdnse.print_debug(4, "rpc.Helper.GetAttributes: GetProgramInfo failed")
+      return status, "rpc.Helper.GetAttributes: GetProgramInfo failed"
     end
   
     mnt_comm, result = Comm:new('mountd', mountd.version)