From 69ae7902bb2ba16f6312aaaa0cdee1204297905a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 5 Apr 1999 05:18:07 +0000
Subject: Disable VFS routines if no libdl available. (This used to be commit
 cbfd8a8990b4d06d0c866274e7d28e4a5e384686)

---
 source3/smbd/vfs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'source3/smbd/vfs.c')

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 937bc1606e..59e7bb4935 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
+#ifdef HAVE_LIBDL
 #include <dlfcn.h>
+#endif
 
 extern int DEBUGLEVEL;
 
@@ -115,6 +117,7 @@ struct vfs_ops default_vfs_ops = {
 /****************************************************************************
   call vfs_init function of loadable module
 ****************************************************************************/
+#ifdef HAVE_LIBDL
 BOOL do_vfs_init(char *vfs_object)
 {
     void *handle, (*fptr)(void);
@@ -139,6 +142,7 @@ BOOL do_vfs_init(char *vfs_object)
 
     return True;
 }
+#endif
 
 /****************************************************************************
   initialise default vfs hooks
@@ -154,6 +158,7 @@ int vfs_init_default(connection_struct *conn)
 /****************************************************************************
   initialise custom vfs hooks
 ****************************************************************************/
+#ifdef HAVE_LIBDL
 int vfs_init_custom(connection_struct *conn)
 {
     void *handle, *fptr;
@@ -189,12 +194,11 @@ int vfs_init_custom(connection_struct *conn)
     bcopy(&dl_ops, &conn->vfs_ops, sizeof(dl_ops));
     dlclose(handle);
 
-#if 0
     do_vfs_init(lp_vfsobj(SNUM(conn)));
-#endif
 
     return 0;
 }
+#endif
 
 /*******************************************************************
   check if a vfs file exists
@@ -233,7 +237,6 @@ ssize_t vfs_read_data(files_struct *fsp,char *buffer,size_t N)
     }
 #else /* WITH_SSL */
     ret = fsp->conn->vfs_ops.read(fd,buffer + total,N - total);
-    DEBUG(0, ("VFS_READ -> read %d/%d bytes\n", ret, N));
 #endif /* WITH_SSL */
 
     if (ret == 0)
-- 
cgit