View | Details | Raw Unified | Return to bug 1555 | Differences between
and this patch

Collapse All | Expand All

(-)ssh.orig/sftp-common.c (-6 / +12 lines)
Lines 87-98 stat_to_attrib(const struct stat *st, At Link Here
87
	a->mtime = st->st_mtime;
87
	a->mtime = st->st_mtime;
88
	a->ext_flags |= SSH2_FXE_EXTATTR_CTIME;
88
	a->ext_flags |= SSH2_FXE_EXTATTR_CTIME;
89
	a->ctime = st->st_ctime;
89
	a->ctime = st->st_ctime;
90
	a->ext_flags |= SSH2_FXE_EXTATTR_ATIMENSEC;
90
	if (st->st_atimensec) {
91
	a->atimensec = st->st_atimensec;
91
		a->ext_flags |= SSH2_FXE_EXTATTR_ATIMENSEC;
92
	a->ext_flags |= SSH2_FXE_EXTATTR_MTIMENSEC;
92
		a->atimensec = st->st_atimensec;
93
	a->mtimensec = st->st_mtimensec;
93
	}
94
	a->ext_flags |= SSH2_FXE_EXTATTR_CTIMENSEC;
94
	if (st->st_mtimensec) {
95
	a->ctimensec = st->st_ctimensec;
95
		a->ext_flags |= SSH2_FXE_EXTATTR_MTIMENSEC;
96
		a->mtimensec = st->st_mtimensec;
97
	}
98
	if (st->st_ctimensec) {
99
		a->ext_flags |= SSH2_FXE_EXTATTR_CTIMENSEC;
100
		a->ctimensec = st->st_ctimensec;
101
	}
96
	a->ext_flags |= SSH2_FXE_EXTATTR_DEV;
102
	a->ext_flags |= SSH2_FXE_EXTATTR_DEV;
97
	a->dev = st->st_dev;
103
	a->dev = st->st_dev;
98
	a->ext_flags |= SSH2_FXE_EXTATTR_INO;
104
	a->ext_flags |= SSH2_FXE_EXTATTR_INO;
(-)ssh.orig/sftp-server.c (+7 lines)
Lines 1271-1276 process_extended_attrconfig(u_int32_t id Link Here
1271
	mask = get_int();
1271
	mask = get_int();
1272
	dir_ext_attr_mask = mask & SUPPORTED_EXT_ATTR;
1272
	dir_ext_attr_mask = mask & SUPPORTED_EXT_ATTR;
1273
1273
1274
	if ((stat_ext_attr_mask & SSH2_FXE_EXTATTR_ATIME) &&
1275
	    (stat_ext_attr_mask & SSH2_FXE_EXTATTR_MTIME))
1276
		stat_attr_mask &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
1277
	if ((dir_ext_attr_mask & SSH2_FXE_EXTATTR_ATIME) &&
1278
	    (dir_ext_attr_mask & SSH2_FXE_EXTATTR_MTIME))
1279
		dir_attr_mask &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
1280
1274
	debug3("request %u: attrconfig", id);
1281
	debug3("request %u: attrconfig", id);
1275
1282
1276
	send_attrconfig_reply(id);
1283
	send_attrconfig_reply(id);

Return to bug 1555