summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
-rw-r--r--sftp-server.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 72566dca4..581181db9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 - (bal) Cleaned out bsd-snprintf.c. VARARGS have been banished and 3 - (bal) Cleaned out bsd-snprintf.c. VARARGS have been banished and
4 I did a base KNF over the whe whole file to make it more acceptable. 4 I did a base KNF over the whe whole file to make it more acceptable.
5 (backed out of original patch and removed it from ChangeLog) 5 (backed out of original patch and removed it from ChangeLog)
6 - (bal) Use chown() if fchown() does not exist in ftp-server.c patch by
7 Tim Rice <tim@multitalents.net>
6 8
720010212 920010212
8 - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1", 10 - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1",
@@ -3910,4 +3912,4 @@
3910 - Wrote replacements for strlcpy and mkdtemp 3912 - Wrote replacements for strlcpy and mkdtemp
3911 - Released 1.0pre1 3913 - Released 1.0pre1
3912 3914
3913$Id: ChangeLog,v 1.752 2001/02/13 02:18:50 mouring Exp $ 3915$Id: ChangeLog,v 1.753 2001/02/13 02:40:56 mouring Exp $
diff --git a/configure.in b/configure.in
index b52448f46..b61673acd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.236 2001/02/13 01:11:17 djm Exp $ 1# $Id: configure.in,v 1.237 2001/02/13 02:40:56 mouring Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -325,10 +325,10 @@ AC_CHECK_FUNC(utimes,
325) 325)
326 326
327# Checks for header files. 327# Checks for header files.
328AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) 328AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stdarg.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
329 329
330dnl Checks for library functions. 330dnl Checks for library functions.
331AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) 331AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
332dnl Checks for time functions 332dnl Checks for time functions
333AC_CHECK_FUNCS(gettimeofday time) 333AC_CHECK_FUNCS(gettimeofday time)
334dnl Checks for libutil functions 334dnl Checks for libutil functions
diff --git a/sftp-server.c b/sftp-server.c
index 346411e79..0291da206 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -609,7 +609,11 @@ process_fsetstat(void)
609 status = errno_to_portable(errno); 609 status = errno_to_portable(errno);
610 } 610 }
611 if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) { 611 if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
612#ifdef HAVE_FCHOWN
612 ret = fchown(fd, a->uid, a->gid); 613 ret = fchown(fd, a->uid, a->gid);
614#else
615 ret = chown(name, a->uid, a->gid);
616#endif
613 if (ret == -1) 617 if (ret == -1)
614 status = errno_to_portable(errno); 618 status = errno_to_portable(errno);
615 } 619 }