1 files changed, 4 insertions, 130 deletions

diff --git a/source/lib/system.c b/source/lib/system.c
index 8fad98b178c..a4420f5c6c2 100644
--- a/source/lib/system.c
+++ b/source/lib/system.c
@@ -74,104 +74,6 @@ int sys_usleep(long usecs)
 }
 
 /*******************************************************************
-A read wrapper that will deal with EINTR.
-********************************************************************/
-
-ssize_t sys_read(int fd, void *buf, size_t count)
-{
-	ssize_t ret;
-
-	do {
-		ret = read(fd, buf, count);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
-A write wrapper that will deal with EINTR.
-********************************************************************/
-
-ssize_t sys_write(int fd, const void *buf, size_t count)
-{
-	ssize_t ret;
-
-	do {
-		ret = write(fd, buf, count);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
-A send wrapper that will deal with EINTR.
-********************************************************************/
-
-ssize_t sys_send(int s, const void *msg, size_t len, int flags)
-{
-	ssize_t ret;
-
-	do {
-		ret = send(s, msg, len, flags);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
-A sendto wrapper that will deal with EINTR.
-********************************************************************/
-
-ssize_t sys_sendto(int s,  const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen)
-{
-	ssize_t ret;
-
-	do {
-		ret = sendto(s, msg, len, flags, to, tolen);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
-A recvfrom wrapper that will deal with EINTR.
-********************************************************************/
-
-ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
-{
-	ssize_t ret;
-
-	do {
-		ret = recvfrom(s, buf, len, flags, from, fromlen);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
-A fcntl wrapper that will deal with EINTR.
-********************************************************************/
-
-int sys_fcntl_ptr(int fd, int cmd, void *arg)
-{
-	int ret;
-
-	do {
-		ret = fcntl(fd, cmd, arg);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
-A fcntl wrapper that will deal with EINTR.
-********************************************************************/
-
-int sys_fcntl_long(int fd, int cmd, long arg)
-{
-	int ret;
-
-	do {
-		ret = fcntl(fd, cmd, arg);
-	} while (ret == -1 && errno == EINTR);
-	return ret;
-}
-
-/*******************************************************************
 A stat() wrapper that will deal with 64 bit filesizes.
 ********************************************************************/
 
@@ -1270,7 +1172,7 @@ int sys_pclose(int fd)
 
 void *sys_dlopen(const char *name, int flags)
 {
-#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
+#ifdef HAVE_LIBDL
 	return dlopen(name, flags);
 #else
 	return NULL;
@@ -1279,7 +1181,7 @@ void *sys_dlopen(const char *name, int flags)
 
 void *sys_dlsym(void *handle, char *symbol)
 {
-#if defined(HAVE_LIBDL) || defined(HAVE_DLSYM)
+#ifdef HAVE_LIBDL
     return dlsym(handle, symbol);
 #else
     return NULL;
@@ -1288,7 +1190,7 @@ void *sys_dlsym(void *handle, char *symbol)
 
 int sys_dlclose (void *handle)
 {
-#if defined(HAVE_LIBDL) || defined(HAVE_DLCLOSE)
+#ifdef HAVE_LIBDL
 	return dlclose(handle);
 #else
 	return 0;
@@ -1297,37 +1199,9 @@ int sys_dlclose (void *handle)
 
 const char *sys_dlerror(void)
 {
-#if defined(HAVE_LIBDL) || defined(HAVE_DLERROR)
+#ifdef HAVE_LIBDL
 	return dlerror();
 #else
 	return NULL;
 #endif
 }
-
-/**************************************************************************
- Wrapper for Admin Logs.
-****************************************************************************/
-
-void sys_adminlog(int priority, const char *format_str, ...)
-{
-	va_list ap;
-	int ret;
-	char **msgbuf = NULL;
-
-	if (!lp_admin_log())
-		return;
-
-	va_start( ap, format_str );
-	ret = vasprintf( msgbuf, format_str, ap );
-	va_end( ap );
-
-	if (ret == -1)
-		return;
-
-#if defined(HAVE_SYSLOG)
-	syslog( priority, "%s", *msgbuf );
-#else
-	DEBUG(0,("%s", *msgbuf ));
-#endif
-	SAFE_FREE(*msgbuf);
-}