diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-03 14:06:32 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-04 12:12:14 -0700 |
| commit | 8ff244ec2d0a57bc4cd9dbbf1f14dea42ae9a068 (patch) | |
| tree | e4bce062f0bdaa0394a9e132295ad02b9b662a97 /source3/modules/vfs_recycle.c | |
| parent | 2938fe6f90471e8fabf583a5eb585597381df97d (diff) | |
| download | samba-8ff244ec2d0a57bc4cd9dbbf1f14dea42ae9a068.tar.gz samba-8ff244ec2d0a57bc4cd9dbbf1f14dea42ae9a068.tar.bz2 samba-8ff244ec2d0a57bc4cd9dbbf1f14dea42ae9a068.zip | |
Cope with +1 change on moving from safe_strcat to strlcat.
Diffstat (limited to 'source3/modules/vfs_recycle.c')
| -rw-r--r-- | source3/modules/vfs_recycle.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |