From e05a3a1aae2328184cd8ea833a51ee682a4c0f70 Mon Sep 17 00:00:00 2001
From: Michael Howe <michael@michaelhowe.org>
Date: Thu, 26 Jan 2017 21:40:22 +0000
Subject: [PATCH] Add with-creds-run-aklog

This lets us get AFS tokens in a separate PAG
---
 Makefile                 |  1 +
 bin/with-creds           | 13 +++----------
 bin/with-creds-run-aklog |  4 ++++
 debian/changelog         |  3 ++-
 4 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 bin/with-creds-run-aklog

diff --git a/Makefile b/Makefile
index 49ce0b3..491662d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ install:
 	$(INSTALL) -d $(DESTDIR)/usr/bin
 	$(INSTALL) -m 0755 $(srcdir)/bin/rksu $(DESTDIR)/usr/bin/rksu
 	$(INSTALL) -m 0755 $(srcdir)/bin/with-creds $(DESTDIR)/usr/bin/with-creds
+	$(INSTALL) -m 0755 $(srcdir)/bin/with-creds-run-aklog $(DESTDIR)/usr/bin/with-creds-run-aklog
 	$(INSTALL) -m 0755 $(srcdir)/bin/build-package $(DESTDIR)/usr/bin/build-package
 
 .PHONY: install
diff --git a/bin/with-creds b/bin/with-creds
index f91549b..96551ee 100755
--- a/bin/with-creds
+++ b/bin/with-creds
@@ -65,9 +65,9 @@ fi
 
 PRINC=$KRBUSER$userpart_slash$REALMARG
 
-EXTRAOPTS=""
+WITH_CREDS_RUN=""
 if [ -n "$aklog" ]; then
-    EXTRAOPTS="-t"
+    WITH_CREDS_RUN="with-creds-run-aklog"
 fi
 
 TMPDIR=/tmp
@@ -79,11 +79,4 @@ export KRB5CCNAME=${TMPDIR}/krb5cc_${UID}_${KRBUSER}_${userpart}
 
 k5start -H 30 -u "$PRINC" $EXTRAOPTS
 
-#if klist -s -c $ccache; then
-#    export KRB5CCNAME=$ccache
-#else
-#    export KRB5CCNAME=$ccache
-#    kinit -p $KRBUSER$userpart_slash$REALMARG
-#fi
-
-exec "$@"
+$WITH_CREDS_RUN "$@"
diff --git a/bin/with-creds-run-aklog b/bin/with-creds-run-aklog
new file mode 100644
index 0000000..f36b225
--- /dev/null
+++ b/bin/with-creds-run-aklog
@@ -0,0 +1,4 @@
+#!/usr/bin/pagsh
+
+aklog
+exec "$@"
diff --git a/debian/changelog b/debian/changelog
index 8abcabc..4b19ecb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-mh-sysadmin-tools (1.6~test.2) UNRELEASED; urgency=low
+mh-sysadmin-tools (1.6~test.3) UNRELEASED; urgency=low
 
   * build-package: new script for package building via cowbuilder/pbuilder
+  * with-creds: add with-creds-run-aklog script to make `-a` work correctly 
 
  -- Michael Howe <michael@michaelhowe.org>  Thu, 07 Aug 2014 19:11:00 +0100
 
-- 
2.39.5