View | Details | Raw Unified | Return to bug 91134
Collapse All | Expand All

(-)./src/bin/cp/utils.c (-2 / +8 lines)
Lines 204-211 Link Here
204
	 * to remove it if we created it and its length is 0.
204
	 * to remove it if we created it and its length is 0.
205
	 */
205
	 */
206
206
207
	if (pflag && setfile(fs, to_fd))
208
		rval = 1;
209
	if (pflag && preserve_fd_acls(from_fd, to_fd) != 0)
207
	if (pflag && preserve_fd_acls(from_fd, to_fd) != 0)
210
		rval = 1;
208
		rval = 1;
211
	(void)close(from_fd);
209
	(void)close(from_fd);
Lines 213-218 Link Here
213
		warn("%s", to.p_path);
211
		warn("%s", to.p_path);
214
		rval = 1;
212
		rval = 1;
215
	}
213
	}
214
	/*
215
	 * To preserve times in SMB to.p_path, 
216
	 * setfile() should be call *AFTER* we have closed the file
217
	 * descriptors. As we have closed the descriptors, we should
218
	 * pass -1 instead of the `to_fd` value
219
	 */
220
	if (pflag && setfile(fs, -1))
221
		rval = 1;
216
	return (rval);
222
	return (rval);
217
}
223
}

Return to bug 91134