Merge branch 'upstream'

[debian/amanda] / client-src / selfcheck.c

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index 8787a8245f40c0a055d6e7f8197662d10e4e8ad5..aad687228802900b101307a1d3c4977664659613 100644 (file)
--- a/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@ -47,6 +47,12 @@
 #include "findpass.h"
 #endif
 
+#define selfcheck_debug(i,x) do {      \
+       if ((i) <= debug_selfcheck) {   \
+           dbprintf(x);                \
+       }                               \
+} while (0)
+
 int need_samba=0;
 int need_rundump=0;
 int need_dump=0;
@@ -119,6 +125,10 @@ main(
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
+#if defined(USE_DBMALLOC)
+    malloc_size_1 = malloc_inuse(&malloc_hist_1);
+#endif
+
     erroutput_type = (ERR_INTERACTIVE|ERR_SYSLOG);
     dbopen(DBG_SUBDIR_CLIENT);
     startclock();