Renamed vfs_init() to smbd_vfs_init() to allow vfs modules to compile.

(This used to be commit 7c3542ba8764be48b88255dd7f73ea6d87be10ac)

diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 5953da1843e4fae1e2bef348e5e5e62370a4dfcc..7ba40a5bd01fa707a0791f20d456fb4cbd0b6a64 100644 (file)
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -99,7 +99,7 @@ static BOOL create_conn_struct( connection_struct *conn, int snum, char *path)
        conn->service = snum;
        conn->connectpath = path;
 
-       if (!vfs_init(conn)) {
+       if (!smbd_vfs_init(conn)) {
                DEBUG(0,("create_conn_struct: vfs init failed.\n"));
                return False;
        }

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 69283d3bf50c6e13187742a3d1d95d8845dc0424..6f2c28d19c173eb64e10de9a8844f96297c3de48 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -551,7 +551,7 @@ connection_struct *make_connection(char *service,char *password,
        }
        /* Initialise VFS function pointers */
 
-       if (!vfs_init(conn)) {
+       if (!smbd_vfs_init(conn)) {
                DEBUG(0, ("vfs_init failed for service %s\n", lp_servicename(SNUM(conn))));
                conn_free(conn);
                return NULL;

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 05645f7b19dce3f1bdfc8bc281a45d6b1f44eac7..7a3d23d652649a6764fb84b09dbc208e82267c6e 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -154,7 +154,7 @@ static BOOL vfs_init_custom(connection_struct *conn)
  Generic VFS init.
 ******************************************************************/
 
-BOOL vfs_init(connection_struct *conn)
+BOOL smbd_vfs_init(connection_struct *conn)
 {
        if (*lp_vfsobj(SNUM(conn))) {
 #ifdef HAVE_LIBDL
@@ -162,13 +162,13 @@ BOOL vfs_init(connection_struct *conn)
                /* Loadable object file */
  
                if (!vfs_init_custom(conn)) {
-                       DEBUG(0, ("vfs_init: vfs_init_custom failed\n"));
+                       DEBUG(0, ("smbd_vfs_init: vfs_init_custom failed\n"));
                        return False;
                }
 
                return True;
 #else
-               DEBUG(0, ("vfs_init: No libdl present - cannot use VFS objects\n"));
+               DEBUG(0, ("smbd_vfs_init: No libdl present - cannot use VFS objects\n"));
                return False;
 #endif
        }