From 43981bdeff91ca63442524993ca940742b71bc86 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Fri, 15 Jun 2018 15:10:12 -0700
Subject: [PATCH] use correct version of ktutil
---
NEWS | 2 ++
manifests/wallet/keytab.pp | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 113161b..cf37e47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
unreleased (207x-xx-xx)
+ [wallet] Make wallet ketyab use the correct path for ktutil.
+
[duo] Change apt pin file to point to codename rather than archive
name. [adamhl]
diff --git a/manifests/wallet/keytab.pp b/manifests/wallet/keytab.pp
index 18c8ec7..893e1be 100644
--- a/manifests/wallet/keytab.pp
+++ b/manifests/wallet/keytab.pp
@@ -8,12 +8,19 @@ define base::wallet::keytab(
$heimdal = false
) {
include base::wallet::client
+
+ if ($::lsbdistcodename == 'wheezy') {
+ $ktutil_exe = '/usr/sbin/ktutil'
+ } else {
+ $ktutil_exe = '/usr/bin/ktutil'
+ }
+
$wallet_opts = "-f '$path' get keytab '$name'"
exec { "wallet $wallet_opts":
path => '/bin:/usr/bin:/usr/local/bin:/usr/kerberos/bin',
command => "${kstart_cmd} wallet ${wallet_opts}",
unless => $heimdal ? {
- true => "/usr/sbin/ktutil -k '$path' list | grep -i -q '$name'",
+ true => "${ktutil_exe} -k '$path' list | grep -i -q '$name'",
false => "klist -k '$path' | grep -i -q '$name'",
},
require => [ Package['kstart'], Package['wallet-client'] ],
--
GitLab