diff -r 28433f06d5ee -r afd57ce39ec9 src/server/daemon/func.h
--- a/src/server/daemon/func.h	Mon Jul 01 18:05:13 2013 +0200
+++ b/src/server/daemon/func.h	Mon Jul 08 11:10:54 2013 +0200
@@ -35,6 +35,10 @@
 extern "C" {
 #endif
 
+#define SAF_EXEC(f,pb,sn,rq) (f)->func_exec ? \
+    (f)->func_exec(f, pb, sn, rq) : \
+    (f)->func(pb, sn, rq)
+
 void func_init();
 
 void add_function(struct FuncStruct *func);