Rescue Rex::Proto::SunRPC::RPCTimeout

Coincidentally, this also fixes the rescue in the library, since
rescuing Timeout instead of Timeout::Error does nothing.

lib/rex/proto/sunrpc/client.rb

@@ -179,7 +179,8 @@ class Client
     buf = nil
     begin
       Timeout.timeout(maxwait) { buf = sock.get }
-    rescue ::Timeout
+    rescue Timeout::Error
+      raise RPCTimeout
     end
 
     return nil if not buf

modules/auxiliary/gather/nis_bootparamd_domain.rb

@@ -78,9 +78,7 @@ class MetasploitModule < Msf::Auxiliary
     rescue Rex::Proto::SunRPC::RPCError
       print_error('Could not call bootparamd procedure')
       return
-    # XXX:  This bubbles up from Rex::Proto::SunRPC::Client
+    rescue Rex::Proto::SunRPC::RPCTimeout
-    # TODO: Make it raise Rex::Proto::SunRPC::RPCTimeout
-    rescue Timeout::Error
       print_error('Could not disclose NIS domain name (try another CLIENT?)')
       return
     ensure