2 files changed, 13 insertions, 0 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index a83e17c661..0adfe34032 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -710,6 +710,7 @@ void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,ti
 
 void close_low_fds(BOOL stderr_too)
 {
+#ifndef VALGRIND
 	int fd;
 	int i;
 
@@ -737,6 +738,7 @@ void close_low_fds(BOOL stderr_too)
 			return;
 		}
 	}
+#endif
 }
 
 /****************************************************************************
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 32efee1536..f3fa89b05f 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1366,3 +1366,14 @@ BOOL str_list_substitute(char **list, const char *pattern, const char *insert)
 	
 	return True;
 }
+
+#ifdef VALGRIND
+size_t valgrind_strlen(const char *s)
+{
+	size_t count;
+	for(count = 0; *s++; count++)
+		;
+	return count;
+}
+#endif
+