Cope with +1 change on moving from safe_strcat to strlcat.
authorJeremy Allison <jra@samba.org>
Tue, 3 May 2011 21:06:32 +0000 (14:06 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 4 May 2011 19:12:14 +0000 (12:12 -0700)
source3/modules/vfs_recycle.c

index 22f61b4b33c7f87e5722bc04d7bddafa9b1040a4..1217ad54aff9372d5da6df5dceab9b7c1810f612 100644 (file)
@@ -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);
        }