[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  fe02f47 s3:vfs cleanup unused code in vfs_recycle
      from  ed04cd0 s3:net fix a typo

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fe02f47de04e5e83273ad012effbe15794cd99c1
Author: Christian Ambach <a...@samba.org>
Date:   Thu May 26 10:32:53 2011 +0200

    s3:vfs cleanup unused code in vfs_recycle
    
    connect/disconnect do not more than just logging that they
    were called. this seems pretty useless
    
    Autobuild-User: Christian Ambach <a...@samba.org>
    Autobuild-Date: Thu Jun  9 18:59:58 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_recycle.c |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 1217ad5..5c4f870 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -35,33 +35,9 @@ static int vfs_recycle_debug_level = DBGC_VFS;
 #undef DBGC_CLASS
 #define DBGC_CLASS vfs_recycle_debug_level
  
-static int recycle_connect(vfs_handle_struct *handle, const char *service, 
const char *user);
-static void recycle_disconnect(vfs_handle_struct *handle);
 static int recycle_unlink(vfs_handle_struct *handle,
                          const struct smb_filename *smb_fname);
 
-static int recycle_connect(vfs_handle_struct *handle, const char *service, 
const char *user)
-{
-       int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
-
-       if (ret < 0) {
-               return ret;
-       }
-
-       DEBUG(10,("recycle_connect() connect to service[%s] as user[%s].\n",
-               service,user));
-
-       return 0;
-}
-
-static void recycle_disconnect(vfs_handle_struct *handle)
-{
-       DEBUG(10,("recycle_disconnect() connect to service[%s].\n",
-               lp_servicename(SNUM(handle->conn))));
-
-       SMB_VFS_NEXT_DISCONNECT(handle);
-}
-
 static const char *recycle_repository(vfs_handle_struct *handle)
 {
        const char *tmp_str = NULL;
@@ -663,8 +639,6 @@ done:
 }
 
 static struct vfs_fn_pointers vfs_recycle_fns = {
-       .connect_fn = recycle_connect,
-       .disconnect = recycle_disconnect,
        .unlink = recycle_unlink
 };
 


-- 
Samba Shared Repository