- fix version number, bump release number, added changelog

[myplc.git] / plc.d / functions

diff --git a/plc.d/functions b/plc.d/functions
index ef60c38..4437dd3 100644 (file)
--- a/plc.d/functions
+++ b/plc.d/functions
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: guest.init,v 1.12 2006/04/04 22:09:47 mlhuang Exp $
+# $Id: functions,v 1.6 2006/07/10 21:05:37 mlhuang Exp $
 #
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -13,9 +13,6 @@ export PATH=/sbin:/bin:/usr/bin:/usr/sbin
 # Source function library
 . /etc/init.d/functions
 
-# Source configuration
-. /etc/planetlab/plc_config
-
 # Total number of errors
 ERRORS=0
 
@@ -60,10 +57,13 @@ plc_daemon ()
 
     # And start it up.
     (exec -a plc_${base} $*)
+    ret=$?
 
     if [ -f /var/run/${base}.pid ] ; then
        mv /var/run/${base}.pid /var/run/plc_${base}.pid
     fi
+
+    return $ret
 }
 
 # Print IP address of hostname if resolvable
@@ -72,13 +72,6 @@ gethostbyname ()
     perl -MSocket -e '($a,$b,$c,$d,@addrs) = gethostbyname($ARGV[0]); print inet_ntoa($addrs[0]) . "\n";' $1 2>/dev/null
 }
 
-# Print the CNAME of an SSL certificate
-ssl_cname ()
-{
-    openssl x509 -noout -in $1 -subject | \
-       sed -n -e 's@.*/CN=\([^/]*\).*@\1@p'
-}
-
 # Forcefully make a symlink
 symlink ()
 {