Alexander Barkov wrote:
> Hello again!
>
> Thanks for the patch! This will appear in 3.1.1
>
> Kir, please, find a possibility to eliminate in configure
> whether sys/timex.h present in the system!
I've included it in my TODO.
>
>
> Murray Jensen wrote:
>
> > Here are the patches I had to make in order to get it to compile under
> > Solaris 2.5.1 (the commenting out of sys/timex.h should be conditional
> > compile on HAVE_SYS_TIMEX_H - with a test added to the configure script):
> >
> > ./src/socket.c
> > --- ./src/socket.c-dist Fri Jun 2 16:39:50 2000
> > +++ ./src/socket.c Wed Jun 21 16:03:32 2000
> > @@ -5,7 +5,7 @@
> > #include <stdlib.h>
> > #include <sys/types.h>
> > #include <sys/time.h>
> > -#include <sys/timex.h>
> > +/* #include <sys/timex.h> */
> > #include <errno.h>
> >
> > #include <sys/socket.h>
> > ./src/host.c
> > --- ./src/host.c-dist Fri Jun 2 16:39:42 2000
> > +++ ./src/host.c Wed Jun 21 17:08:55 2000
> > @@ -12,6 +12,10 @@
> > #include "udm_host.h"
> > #include "udm_proto.h"
> >
> > +#ifndef INADDR_NONE
> > +#define INADDR_NONE ((unsigned long)-1)
> > +#endif
> > +
> > int host_lookup( UDM_CONN *connp ){
> > struct hostent *he;
> >
> > ./src/sql.c
> > --- ./src/sql.c-dist Thu Jun 15 06:50:50 2000
> > +++ ./src/sql.c Wed Jun 21 19:54:56 2000
> > @@ -1369,12 +1369,8 @@
> > Lda_Def *lda = &db->lda;
> > char buff[1024];
> >
> > -#ifdef HAVE_SNPRINTF
> > snprintf(buff, sizeof(buff)-1, "%s/%s@%s", DBUser, DBPass, DBName);
> > -#else
> > - sprintf(buff, "%s/%s@%s", DBUser, DBPass, DBName);
> > -#endif
> > -
> > +
> > db->errcode = olog(lda, db->hda,
> > buff, -1,
> > (text *)0, -1,
> > ./src/log.c
> > --- ./src/log.c-dist Wed Apr 26 01:24:20 2000
> > +++ ./src/log.c Wed Jun 21 19:57:45 2000
> > @@ -293,6 +293,43 @@
> > }
> > #endif
> >
> > +#ifndef HAVE_SNPRINTF
> > +int
> > +snprintf(char *buf, int len, const char *fmt, ...)
> > +{
> > +#ifndef HAVE_VSNPRINTF
> > + char *tmpbuf;
> > + int need;
> > +#endif
> > + va_list ap;
> > + int ret;
> > +
> > + va_start(ap, fmt);
> > +
> > +#ifdef HAVE_VSNPRINTF
> > + ret = vsnprintf(buf, len, fmt, ap);
> > +#else
> > + buf[len] = '\0';
> > +
> > + need = udm_vsnprintf(fmt, ap);
> > +
> > + if ((tmpbuf = (char *)malloc(need + 1)) == NULL)
> > + strncpy(buf, "Yuck! Out of memory in vsnprintf!", len);
> > + else {
> > + vsprintf(tmpbuf, fmt, ap);
> > + strncpy(buf, tmpbuf, len);
> > + free(tmpbuf);
> > + }
> > +
> > + ret = strlen(buf);
> > +#endif
> > +
> > + va_end(ap);
> > +
> > + return ret;
> > +}
> > +#endif
> > +
> >
> > /* According to some recommendations, try not to exceed about 800 bytes
> > or you might have problems with old syslog implementations */
> > ./include/udm_crc32.h
> > --- ./include/udm_crc32.h-dist Thu Jun 15 07:27:13 2000
> > +++ ./include/udm_crc32.h Wed Jun 21 16:03:11 2000
> > @@ -9,4 +9,4 @@
> > /* Returns crc32 of null-terminated string */
> > #define crc32(buf) crc32_sz((buf),strlen(buf))
> >
> > -#endif /* _UDM_CRC32_H */
> > \ No newline at end of file
> > +#endif /* _UDM_CRC32_H */
> > ./include/udm_socket.h
> > --- ./include/udm_socket.h-dist Thu Jun 15 07:27:13 2000
> > +++ ./include/udm_socket.h Wed Jun 21 17:06:07 2000
> > @@ -18,4 +18,4 @@
> > int socket_listen(UDM_CONN *connp );
> > int socket_accept(UDM_CONN *connp );
> > int socket_getname(UDM_CONN *connp, struct sockaddr_in *sin);
> > -void socket_buf_clear(UDM_CONN *connp);
> > \ No newline at end of file
> > +void socket_buf_clear(UDM_CONN *connp);
>
> --
> Alexander Barkov
> IZHCOM, Izhevsk
> email: [EMAIL PROTECTED] | http://www.izhcom.ru
> Phone: +7 (3412) 51-23-76 | Fax: +7 (3412) 78-70-10
> ICQ: 7748759
> ______________
> If you want to unsubscribe send "unsubscribe udmsearch"
> to [EMAIL PROTECTED]
--
|< () http://kir.sever.net [EMAIL PROTECTED] [EMAIL PROTECTED] ICQ 7551596
() |_ Microsoft SELLS you Windows, Linux GIVES you the whole house!
______________
If you want to unsubscribe send "unsubscribe udmsearch"
to [EMAIL PROTECTED]
