SCO patch attempt.

[Tim Rice]

On Thu, 11 Jan 2001, Tim Rice wrote:

> On Thu, 11 Jan 2001 mouring at etoh.eviladmin.org wrote:
> 
> > 
> > diff -ur openssh/bsd-misc.h ossh/bsd-misc.h
> > --- openssh/bsd-misc.h	Thu Nov 16 21:47:20 2000
> > +++ ossh/bsd-misc.h	Thu Jan 11 21:34:12 2001
> > @@ -54,4 +54,15 @@
> >  const char *strerror(int e);
> >  #endif 
> >  
> > +
> > +#ifndef HAVE_UTIMES
> > +struct timeval {
> > +	long tv_sec;
> > +	long tv_usec;
> 
> OK, change #ifndef HAVE_UTIMES to
> #if !defined(HAVE_UTIMES)  &&  !defined(HAVE_UTIME)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
It was allready past bedtime when I fired this off and now I can't sleep
because this doesn't make any sense.

I was getting 
...
cc -g -I/usr/local/include -I/usr/local/ssl/include -I. -Isrc -DETCDIR=\"/usr/lo
cal/etc\" -DSSH_PROGRAM=\"/usr/local/bin/ssh\" -DSSH_ASKPASS_DEFAULT=\"/usr/loca
l/libexec/ssh-askpass\" -DHAVE_CONFIG_H -c src/bsd-arc4random.c
UX:acomp: ERROR: "src/bsd-misc.h", line 59: (struct) tag redeclared: timeval
UX:acomp: ERROR: "src/bsd-misc.h", line 64: invalid type combination
gmake: *** [bsd-arc4random.o] Error 1
...

Maybe it should be 
#ifndef HAVE_UTIME_H

I'll do more checking tomorrow.

> 
> In configure.in,
> add utime.h to AC_CHECK_HEADERS
> add utime to AC_CHECK_FUNCS
> 
> In includes.h add
> 	#ifdef HAVE_UTIME_H
> 	# include <utime.h>
> 	#endif
> 
> When I get more time i'll look into the sftp-server problem.
> > 
> > 
> 
> 

-- 
Tim Rice				Multitalents	(707) 887-1469
tim at multitalents.net