From 8ff244ec2d0a57bc4cd9dbbf1f14dea42ae9a068 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 3 May 2011 14:06:32 -0700 Subject: Cope with +1 change on moving from safe_strcat to strlcat. --- source3/modules/vfs_recycle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/modules/vfs_recycle.c') diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 22f61b4b33..1217ad54af 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -304,13 +304,13 @@ static bool recycle_create_dir(vfs_handle_struct *handle, const char *dname) *new_dir = '\0'; if (dname[0] == '/') { /* Absolute path. */ - safe_strcat(new_dir,"/",len); + strlcat(new_dir,"/",len+1); } /* Create directory tree if neccessary */ for(token = strtok_r(tok_str, "/", &saveptr); token; token = strtok_r(NULL, "/", &saveptr)) { - safe_strcat(new_dir, token, len); + strlcat(new_dir, token, len+1); if (recycle_directory_exist(handle, new_dir)) DEBUG(10, ("recycle: dir %s already exists\n", new_dir)); else { @@ -321,7 +321,7 @@ static bool recycle_create_dir(vfs_handle_struct *handle, const char *dname) goto done; } } - safe_strcat(new_dir, "/", len); + strlcat(new_dir, "/", len+1); mode = recycle_subdir_mode(handle); } -- cgit From fe02f47de04e5e83273ad012effbe15794cd99c1 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Thu, 26 May 2011 10:32:53 +0200 Subject: 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 Autobuild-Date: Thu Jun 9 18:59:58 CEST 2011 on sn-devel-104 --- source3/modules/vfs_recycle.c | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'source3/modules/vfs_recycle.c') diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 1217ad54af..5c4f8706cb 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 }; -- cgit