From f0e0dd6507c355103c51058642f1e4245c573413 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 18 Oct 2001 00:27:20 +0000
Subject: Renamed vfs_init() to smbd_vfs_init() to allow vfs modules to
 compile. (This used to be commit 7c3542ba8764be48b88255dd7f73ea6d87be10ac)

---
 source3/msdfs/msdfs.c  | 2 +-
 source3/smbd/service.c | 2 +-
 source3/smbd/vfs.c     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 5953da1843..7ba40a5bd0 100644
--- 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 69283d3bf5..6f2c28d19c 100644
--- 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 05645f7b19..7a3d23d652 100644
--- 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
 	}
-- 
cgit