From 16ce32c640b012ce0aed4b170bcaac9a629c7e2c Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Sun, 21 Jan 2007 15:37:42 +0000
Subject: [PATCH] removed obsolete cron file avoid empty links returned by the
 "link" macro - for standard compliance explain the reasoning for using
 "CryptoBoxRootActionsLocal" in cryptobox.conf reverting it from
 "CryptoBoxRootActions" back to "CryptoBoxRootActionsLocal"

---
 bin/cryptobox.conf   | 5 ++++-
 stuff/cron-cryptobox | 1 -
 templates/macros.cs  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 stuff/cron-cryptobox

diff --git a/bin/cryptobox.conf b/bin/cryptobox.conf
index 4aa2751..59ad492 100644
--- a/bin/cryptobox.conf
+++ b/bin/cryptobox.conf
@@ -85,7 +85,10 @@ umount		= /bin/umount
 nice		= /usr/bin/nice
 super		= /usr/bin/super
 # this is the "program" name as defined in /etc/super.tab
-CryptoBoxRootActions = CryptoBoxRootActions
+# "CryptoBoxRootActionsLocal" (in /etc/super.tab) should point to the
+# CryptoBoxRootActions.py file in your local sorkign directory - this avoids
+# conflicts with a locally (apt-)installed CryptoBoxRootActions.py file
+CryptoBoxRootActions = CryptoBoxRootActionsLocal
 
 
 [PluginSettings]
diff --git a/stuff/cron-cryptobox b/stuff/cron-cryptobox
deleted file mode 100644
index 67d9661..0000000
--- a/stuff/cron-cryptobox
+++ /dev/null
@@ -1 +0,0 @@
-* *	* * *	root	[ -e /usr/lib/cryptobox/cbox-manage.sh ] && /usr/lib/cryptobox/check_smb_idle.sh
diff --git a/templates/macros.cs b/templates/macros.cs
index dc3c6fd..13d933c 100644
--- a/templates/macros.cs
+++ b/templates/macros.cs
@@ -22,6 +22,8 @@ def:link(path, attr1, value1, attr2, value2)
 				?><?cs var:url_escape(name(attrs)) ?>=<?cs var:url_escape(attrs)
 			?><?cs /if
 		?><?cs /each
+	?><?cs elif:path == ""
+		?>./<?cs # avoid empty links as they are not standard compliant
 	?><?cs /if ?><?cs
  /def ?><?cs