From 1acca22141b22ff9d3063b931ee8fb52155c1cc3 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 29 Jun 2022 20:45:58 -0700
Subject: [PATCH] make kinit as admin simpler

---
 func/stacks/ipa/20-ipa-user.sh    | 10 +---------
 func/stacks/ipa/21-ipa-service.sh | 10 +---------
 func/stacks/ipa/22-ipa-dns.sh     | 10 +---------
 func/stacks/ipa/23-ipa-sudo.sh    | 10 +---------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/func/stacks/ipa/20-ipa-user.sh b/func/stacks/ipa/20-ipa-user.sh
index 9965a56..71be555 100755
--- a/func/stacks/ipa/20-ipa-user.sh
+++ b/func/stacks/ipa/20-ipa-user.sh
@@ -13,15 +13,7 @@ kdestroy &> /dev/null
 klist 2>&1 | grep -E "(No credentials|Credentials cache .* not found)" &> /dev/null
 r_checkExitStatus $?
 
-expect -f - <<EOF
-set send_human {.1 .3 1 .05 2}
-spawn kinit admin
-sleep 1
-expect "Password for admin@RLIPA.LOCAL:"
-send -h "b1U3OnyX!\r"
-sleep 5
-close
-EOF
+echo "b1U3OnyX!" | kinit admin@RLIPA.LOCAL
 
 klist | grep "admin@RLIPA.LOCAL" &> /dev/null
 r_checkExitStatus $?
diff --git a/func/stacks/ipa/21-ipa-service.sh b/func/stacks/ipa/21-ipa-service.sh
index db50dd1..408709b 100755
--- a/func/stacks/ipa/21-ipa-service.sh
+++ b/func/stacks/ipa/21-ipa-service.sh
@@ -13,15 +13,7 @@ kdestroy &> /dev/null
 klist 2>&1  | grep -E "(No credentials|Credentials cache .* not found)" &> /dev/null
 r_checkExitStatus $?
 
-expect -f - <<EOF
-set send_human {.1 .3 1 .05 2}
-spawn kinit admin
-sleep 1
-expect "Password for admin@RLIPA.LOCAL:"
-send -h "b1U3OnyX!\r"
-sleep 5
-close
-EOF
+echo "b1U3OnyX!" | kinit admin@RLIPA.LOCAL
 
 klist | grep "admin@RLIPA.LOCAL" &> /dev/null
 r_checkExitStatus $?
diff --git a/func/stacks/ipa/22-ipa-dns.sh b/func/stacks/ipa/22-ipa-dns.sh
index 4d74174..d9aa8e9 100755
--- a/func/stacks/ipa/22-ipa-dns.sh
+++ b/func/stacks/ipa/22-ipa-dns.sh
@@ -13,15 +13,7 @@ kdestroy &> /dev/null
 klist 2>&1  | grep -qE "(No credentials|Credentials cache .* not found)" &> /dev/null
 r_checkExitStatus $?
 
-expect -f - <<EOF
-set send_human {.1 .3 1 .05 2}
-spawn kinit admin
-sleep 1
-expect "Password for admin@RLIPA.LOCAL:"
-send -h "b1U3OnyX!\r"
-sleep 5
-close
-EOF
+echo "b1U3OnyX!" | kinit admin@RLIPA.LOCAL
 
 klist | grep "admin@RLIPA.LOCAL" &> /dev/null
 r_checkExitStatus $?
diff --git a/func/stacks/ipa/23-ipa-sudo.sh b/func/stacks/ipa/23-ipa-sudo.sh
index 68e50ac..983bd41 100755
--- a/func/stacks/ipa/23-ipa-sudo.sh
+++ b/func/stacks/ipa/23-ipa-sudo.sh
@@ -13,15 +13,7 @@ kdestroy &> /dev/null
 klist 2>&1  | grep -E "(No credentials|Credentials cache .* not found)" &> /dev/null
 r_checkExitStatus $?
 
-expect -f - <<EOF
-set send_human {.1 .3 1 .05 2}
-spawn kinit admin
-sleep 1
-expect "Password for admin@RLIPA.LOCAL:"
-send -h "b1U3OnyX!\r"
-sleep 5
-close
-EOF
+echo "b1U3OnyX!" | kinit admin@RLIPA.LOCAL
 
 klist | grep "admin@RLIPA.LOCAL" &> /dev/null
 r_checkExitStatus $?