Use new python version of automounter script

diff --git a/auto.pl_sshd b/auto.pl_sshd
deleted file mode 100755 (executable)
index 745b978..0000000
--- a/auto.pl_sshd
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# autofs(5) executable map for /var/pl_sshd/keys/
-#
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2004 The Trustees of Princeton University
-#
-# $Id: auto.pl_sshd,v 1.3 2004/10/04 22:20:11 mlhuang Exp $
-#
-
-usage()
-{
-    echo "usage: $0 slice" >/dev/stderr
-    exit 1
-}
-
-[ -z "$1" ] && usage
-slice="$1"
-
-# Try real home directory first
-eval home="~$slice"
-if [ -f "$home/.ssh/authorized_keys" ] ; then
-    echo "--bind,-r :$home/.ssh"
-    exit 0
-fi
-
-# Try virtual server home directory next
-vbase=/vservers/$slice
-keyfile=/home/$slice/.ssh/authorized_keys
-
-echo -n "Retrieving SSH keys for $slice... " >/dev/stderr
-
-keydata=`curl -s \
-    --fail \
-    --max-time 15 \
-    "http://localhost:815/keys?slice=$slice"`
-
-rc=$?
-if [ "$rc" -ne 0 ] ; then
-    echo "curl failed with error $rc." >/dev/stderr
-    exit $rc
-fi
-
-# write the keyfile while running as the slice user, this prevents
-# various potential exploits
-su - $slice >/dev/null 2>&1 <<EOF
-install -d -m 700 ${keyfile%/*}
-touch $keyfile
-chmod 600 $keyfile
-echo $keydata >$keyfile
-EOF
-
-if [ "`cat $vbase$keyfile 2>/dev/null`" != "$keydata" ]; then
-    echo "unable to write $vbase$keyfile." >/dev/stderr
-    exit 1
-fi
-
-echo "succeeded." >/dev/stderr
-
-echo "--bind,-r :$vbase/home/$slice/.ssh"
-exit 0

diff --git a/pl_sshd.spec b/pl_sshd.spec
index 8504e9b..9762a89 100644 (file)
--- a/pl_sshd.spec
+++ b/pl_sshd.spec
@@ -1,6 +1,6 @@
 %define name pl_sshd
 %define version 1.0
-%define release 5.planetlab%{?date:.%{date}}
+%define release 6.planetlab%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -33,7 +33,7 @@ directory.
 mkdir -p $RPM_BUILD_ROOT/var/pl_sshd/keys
 install -D -m 0755 pl_sshd.sh $RPM_BUILD_ROOT/usr/local/sbin/pl_sshd.sh
 install -D -m 0755 pl_sshd $RPM_BUILD_ROOT/etc/init.d/pl_sshd
-install -D -m 0755 auto.pl_sshd $RPM_BUILD_ROOT/etc/auto.pl_sshd
+install -D -m 0755 auto.pl_sshd.py $RPM_BUILD_ROOT/etc/auto.pl_sshd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Thu Apr  7 2005 Steve Muir <smuir@cs.princeton.edu>
+- convert auto.pl_sshd to a python script (simpler and less error-prone)
+
 * Mon Dec  1 2003 Steve Muir <smuir@cs.princeton.edu>
 - initial creation from files in sidewinder repository