--- cluster_1.2.c	2006-04-19 04:54:08.000000000 -0300
+++ cluster.c	2007-05-31 18:23:00.000000000 -0300
@@ -49,6 +49,7 @@
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
+#include "asterisk/strings.h"
 
 
 #include "config.h"
@@ -124,10 +125,10 @@
 
 static const char* inaddr2s(struct in_addr addr)
 {
-  /* Beware: this is not thread safe */
   static char buf[20];
 
-  return ast_inet_ntoa(buf, sizeof(buf), addr);
+  ast_copy_string(buf, ast_inet_ntoa(addr), sizeof(buf));
+  return buf;
 }
 
 static int timediff_msec(struct timeval t1, struct timeval t2)