From 31dbe005146f18ab7b9d797464b64c56efbea094 Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Wed, 28 Jan 2015 10:23:03 -0800
Subject: [PATCH] use perl DNS methods instead of shell cmds

---
 plugins/karma_tool | 9 +++++----
 plugins/tls_cert   | 8 +++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/karma_tool b/plugins/karma_tool
index 0af089d..216afb1 100755
--- a/plugins/karma_tool
+++ b/plugins/karma_tool
@@ -9,8 +9,10 @@ use Net::IP qw(:PROC);
 use POSIX qw(strftime);
 
 use lib 'lib';
+use Qpsmtpd::Base;
 use Qpsmtpd::DB;
 
+my $base = Qpsmtpd::Base->new();
 my $self = bless({args => {db_dir => 'config'},}, 'Karma');
 my $command = $ARGV[0];
 
@@ -119,8 +121,7 @@ sub show_ip {
     if ($penalty_start_ts) {
         $time_human = strftime "%a %b %e %H:%M", localtime $penalty_start_ts;
     }
-    my $hostname = `dig +short -x $ip` || '';
-    chomp $hostname;
+    my $hostname = $base->resolve_ptr($ip);
     print
 "      IP Address                 Penalty        Naughty  Nice  Connects  Hostname\n";
     printf(" %-18s  %24s    %3s     %3s     %3s    %-30s\n",
@@ -164,8 +165,8 @@ sub main {
         }
         my $hostname = '';
         if ($naughty && $nice) {
-
-            #$hostname = `dig +short -x $ip`; chomp $hostname;
+            # this can be slow, waiting for each IP to resolve
+            #$hostname = $base->resolve_ptr($ip);
         }
         printf(" %-18s  %24s    %3s     %3s     %3s    %30s\n",
                $ip, $time_human, $naughty, $nice, $connects, $hostname);
diff --git a/plugins/tls_cert b/plugins/tls_cert
index e4d52fa..f18a7af 100644
--- a/plugins/tls_cert
+++ b/plugins/tls_cert
@@ -3,15 +3,13 @@
 use strict;
 use warnings;
 
-# Very basic script to create TLS certificates for qpsmtpd
+# create TLS certificates for qpsmtpd
 use File::Temp qw/ tempfile tempdir /;
 use Getopt::Long;
+use Sys::Hostname;
 
 my %opts = ();
-chomp (my $hostname = `hostname --fqdn`);
-if ($?) {
-    chomp($hostname = `hostname`);
-}
+my $hostname = hostname();
 print "Using hostname: $hostname\n";
 my %defaults = (
     C  => 'XY',