From 7a9de1e10db20718842d90af147aac21879b8348 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 14 Mar 2014 10:17:09 +0200
Subject: [PATCH 1/3] sendmail: Require sendmail package before deploying
 private key to get smmsp group into system.

---
 sendmail/manifests/init.pp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/sendmail/manifests/init.pp b/sendmail/manifests/init.pp
index 3b9b07e..13869b1 100644
--- a/sendmail/manifests/init.pp
+++ b/sendmail/manifests/init.pp
@@ -167,12 +167,16 @@ class sendmail::client::msa inherits sendmail::client {
         $ssl_key = basename($sendmail_ssl_key)
         $ssl_cert = basename($sendmail_ssl_cert)
         file { "${ssl::private}/${ssl_key}":
-            ensure => present,
-            mode   => "0640",
-            owner  => "root",
-            group  => "smmsp",
-            source => $sendmail_ssl_key,
-            notify => Service["sendmail"],
+            ensure  => present,
+            mode    => "0640",
+            owner   => "root",
+            group   => "smmsp",
+            source  => $sendmail_ssl_key,
+            require => $::operatingsystem ? {
+                "openbsd" => undef,
+                default   => Package["sendmail"],
+            },
+            notify  => Service["sendmail"],
         }
         file { "${ssl::certs}/${ssl_cert}":
             ensure => present,

From bb181cb2a95d5620b2e52884fa400d745f4e7cfa Mon Sep 17 00:00:00 2001
From: Ossi Herrala <ossi.herrala@codenomicon.com>
Date: Fri, 14 Mar 2014 16:17:21 +0000
Subject: [PATCH 2/3] sudo: Add fake version. You know why. :)

---
 sudo/files/fakesudo    | 25 +++++++++++++++++++++++++
 sudo/manifests/init.pp | 14 ++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 sudo/files/fakesudo

diff --git a/sudo/files/fakesudo b/sudo/files/fakesudo
new file mode 100644
index 0000000..390d017
--- /dev/null
+++ b/sudo/files/fakesudo
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+trap report SIGINT SIGTERM
+
+function askpw {
+    # echo -n "Password:"
+    read -s -p "Password:" password
+    password=""
+    echo ""
+    echo "Sorry, try again."
+}
+
+function report {
+    stty echo # Fix echo if ^C during password prompt
+    ( whoami ; date ) | mailx -s "Someone sudo'ed (`id -un`, ${SSH_CONNECTION})" root
+    exit 1
+}
+
+function main {
+    for try in 1 2 3; do askpw; done
+    echo "sudo: 3 incorrect password attempts"
+    report
+}
+
+main
diff --git a/sudo/manifests/init.pp b/sudo/manifests/init.pp
index 6b21b1f..6a4f273 100644
--- a/sudo/manifests/init.pp
+++ b/sudo/manifests/init.pp
@@ -37,6 +37,20 @@ class sudo {
 
 }
 
+# Install fake sudo
+#
+class sudo::fake {
+
+  file { "/usr/bin/sudo":
+    ensure => present,
+    mode   => 0555,
+    owner  => "root",
+    group  => "root",
+    source => "puppet:///modules/sudo/fakesudo",
+  }
+  
+}
+
 # Add sudoer.
 #
 # === Parameters

From d1af2d572623f593c8f8bf5e79a75ca18ccf8e20 Mon Sep 17 00:00:00 2001
From: Ossi Herrala <ossi.herrala@codenomicon.com>
Date: Fri, 14 Mar 2014 16:19:15 +0000
Subject: [PATCH 3/3] sudo: Remove unneccessary comment

---
 sudo/files/fakesudo | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sudo/files/fakesudo b/sudo/files/fakesudo
index 390d017..8541c21 100644
--- a/sudo/files/fakesudo
+++ b/sudo/files/fakesudo
@@ -3,7 +3,6 @@
 trap report SIGINT SIGTERM
 
 function askpw {
-    # echo -n "Password:"
     read -s -p "Password:" password
     password=""
     echo ""