Index: cvsapi/unix/DnsApi.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/unix/DnsApi.cpp,v retrieving revision 1.1.2.5 diff -c -r1.1.2.5 DnsApi.cpp *** cvsapi/unix/DnsApi.cpp 7 Jun 2006 16:35:48 -0000 1.1.2.5 --- cvsapi/unix/DnsApi.cpp 27 Mar 2007 06:53:41 -0000 *************** *** 24,29 **** --- 24,30 ---- #include "../lib/api_system.h" #ifdef HAVE_MDNS + #include #include #include #include *************** *** 35,40 **** --- 36,112 ---- #include "../ServerIO.h" #include "../cvs_string.h" + #if defined __HP_aCC + + ssize_t res_query( + char *dname, + int c, + int type, + u_char *answer, + int anslen + ); + + ssize_t res_search( + char *dname, + int c, + int type, + u_char *answer, + int anslen + ); + + ssize_t res_mkquery( + int op, + const char *dname, + int c, + int type, + const char *data, + int datalen, + const char *newrr, + char *buf, + int buflen + ); + + ssize_t res_send( + const char *msg, + ssize_t msglen, + char *answer, + int anslen + ); + + int res_init(); + + ssize_t dn_comp( + u_char *comp_dn, + ssize_t ssize_length, + u_char **dnptrs, + u_char *exp_dn, + int i_length + ); + + ssize_t dn_expand( + const u_char *msg, + const u_char *eomorig, + const u_char *comp_dn, + u_char *exp_dn, + int i_length + ); + + + int set_resfield( + int i_field, + void *ptr_value + ); + + int get_resfield( + int i_field, + void *ptr_value, + size_t i_value + ); + + void herror(char *s); + #endif + + #include "../DnsApi.h" CDnsApi::CDnsApi() *************** *** 55,61 **** #else m_pdnsBase = new u_char[16384]; HEADER *h = (HEADER*)m_pdnsBase; ! int ret = res_query(name, C_IN, rrType, m_pdnsBase, 16384); if(ret>0) { /* qdcount should always be 1 for an answer */ --- 127,133 ---- #else m_pdnsBase = new u_char[16384]; HEADER *h = (HEADER*)m_pdnsBase; ! int ret = res_query((char *)name, C_IN, rrType, m_pdnsBase, 16384); if(ret>0) { /* qdcount should always be 1 for an answer */ *************** *** 90,96 **** return false; #else u_char *p = m_pdnsCurrent; ! int n=dn_expand(m_pdnsCurrent, m_pdnsEnd, p, m_dnsName, sizeof(m_dnsName)); if(n<1) { printf("dn_expand failed\n"); --- 162,168 ---- return false; #else u_char *p = m_pdnsCurrent; ! int n=dn_expand(m_pdnsCurrent, m_pdnsEnd, p, (u_char *)m_dnsName, sizeof(m_dnsName)); if(n<1) { printf("dn_expand failed\n"); *************** *** 173,179 **** if(m_type!=DNS_TYPE_PTR) return NULL; ! if(dn_expand(m_pdnsCurrent, m_pdnsEnd, m_prdata, m_dnsTmp, sizeof(m_dnsTmp))<1) return NULL; return m_dnsTmp; #endif --- 245,251 ---- if(m_type!=DNS_TYPE_PTR) return NULL; ! if(dn_expand(m_pdnsCurrent, m_pdnsEnd, m_prdata, (u_char *)m_dnsTmp, sizeof(m_dnsTmp))<1) return NULL; return m_dnsTmp; #endif *************** *** 191,197 **** if(m_type!=DNS_TYPE_TEXT) return NULL; ! if(dn_expand(m_pdnsCurrent, m_pdnsEnd, m_prdata, m_dnsTmp, sizeof(m_dnsTmp))<1) return NULL; return m_dnsTmp; #endif --- 263,269 ---- if(m_type!=DNS_TYPE_TEXT) return NULL; ! if(dn_expand(m_pdnsCurrent, m_pdnsEnd, m_prdata, (u_char *)m_dnsTmp, sizeof(m_dnsTmp))<1) return NULL; return m_dnsTmp; #endif *************** *** 213,219 **** GETSHORT(tmpSrv.priority, p); GETSHORT(tmpSrv.weight, p); GETSHORT(tmpSrv.port, p); ! int n = dn_expand(m_pdnsCurrent, m_pdnsEnd, p, m_dnsTmp, sizeof(m_dnsTmp)); if(n<1) return NULL; p+=n; --- 285,291 ---- GETSHORT(tmpSrv.priority, p); GETSHORT(tmpSrv.weight, p); GETSHORT(tmpSrv.port, p); ! int n = dn_expand(m_pdnsCurrent, m_pdnsEnd, p, (u_char *)m_dnsTmp, sizeof(m_dnsTmp)); if(n<1) return NULL; p+=n; Index: cvsapi/unix/RunFile.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/unix/RunFile.cpp,v retrieving revision 1.1.2.20 diff -c -r1.1.2.20 RunFile.cpp *** cvsapi/unix/RunFile.cpp 11 Jan 2006 18:00:35 -0000 1.1.2.20 --- cvsapi/unix/RunFile.cpp 27 Mar 2007 06:54:10 -0000 *************** *** 119,124 **** --- 119,127 ---- int pid; int fd1[2],fd2[2],fd3[2]; + char * args=(char *)m_args->toString(); + CServerIo::trace(3,"CreateProcess(%s,%s)",path?path:"",args?args:""); + if(m_inputFn && m_inputFn != StandardInput) { pipe(fd1); Index: man/Makefile.in =================================================================== RCS file: /usr/local/cvs/cvsnt/man/Makefile.in,v retrieving revision 1.19.2.23 diff -c -r1.19.2.23 Makefile.in *** man/Makefile.in 26 Oct 2005 04:55:14 -0000 1.19.2.23 --- man/Makefile.in 27 Mar 2007 06:57:52 -0000 *************** *** 199,205 **** --- 199,207 ---- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + if [ "$$inst" = "cvs.1" ]; then $(LN_S) $$inst $(DESTDIR)$(man1dir)/cvsnt.1; fi; \ done + uninstall-man1: @$(NORMAL_UNINSTALL) @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ Index: mdnsclient/Makefile.in =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/Makefile.in,v retrieving revision 1.1.2.8 diff -c -r1.1.2.8 Makefile.in *** mdnsclient/Makefile.in 26 Oct 2005 04:55:15 -0000 1.1.2.8 --- mdnsclient/Makefile.in 27 Mar 2007 06:58:44 -0000 *************** *** 162,167 **** --- 162,168 ---- am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dns.Plo ./$(DEPDIR)/mdnsclient.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/util.Plo + CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 169,175 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libmdnsclient_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libmdnsclient_la_SOURCES) --- 170,175 ---- Index: mdnsclient/mdnsclient.c =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/mdnsclient.c,v retrieving revision 1.1.2.26 diff -c -r1.1.2.26 mdnsclient.c *** mdnsclient/mdnsclient.c 25 Oct 2005 08:59:21 -0000 1.1.2.26 --- mdnsclient/mdnsclient.c 27 Mar 2007 06:51:28 -0000 *************** *** 228,237 **** ssize_t l; int r; ! #ifdef IP_RECVTTL /* In theory anyone that has this also has recvmsg.. */ struct msghdr msg = {0}; struct iovec iov[1]; char control[1024]; iov[0].iov_base = p->data; iov[0].iov_len = sizeof(p->data); --- 228,240 ---- ssize_t l; int r; ! #if defined (IP_RECVTTL ) && ! defined (__HP_aCC) ! /* In theory anyone that has this also has recvmsg.. */ struct msghdr msg = {0}; struct iovec iov[1]; + #if defined (_XOPEN_SOURCE_EXTENDED) || ! defined (__digital) char control[1024]; + #endif iov[0].iov_base = p->data; iov[0].iov_len = sizeof(p->data); *************** *** 239,249 **** --- 242,255 ---- msg.msg_iovlen = 1; msg.msg_name = from; msg.msg_namelen = from_len; + #if defined (_XOPEN_SOURCE_EXTENDED) || ! defined (__digital) msg.msg_control = control; msg.msg_controllen = sizeof(control); + #endif if(( l = recvmsg(fd, &msg, 0)) >= 0) { + #if defined (_XOPEN_SOURCE_EXTENDED) || ! defined (__digital) struct cmsghdr *cmsg; *ttl=255; for(cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg,cmsg)) *************** *** 254,259 **** --- 260,266 ---- break; } } + #endif p->size = (size_t) l; *ret_packet = p; Index: triggers/audit_trigger.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/audit_trigger.cpp,v retrieving revision 1.1.2.33.4.1 diff -c -r1.1.2.33.4.1 audit_trigger.cpp *** triggers/audit_trigger.cpp 27 Mar 2007 01:38:29 -0000 1.1.2.33.4.1 --- triggers/audit_trigger.cpp 27 Mar 2007 06:57:10 -0000 *************** *** 188,199 **** time_t d = get_date((char*)date,NULL); char dt[64]; cvs::string tbl; cvs::sprintf(tbl,80,"%sSessionLog",g_szPrefix); strftime(dt,sizeof(dt),"%Y-%m-%d %H:%M:%S",localtime(&d)); ! g_pDb->Execute("Insert Into %s (Command, Date, Hostname, Username, SessionId, VirtRepos, PhysRepos, Client) Values ('%s','%s','%s','%s','%s','%s','%s','%s')", tbl.c_str(),NULLSTR(command),dt,NULLSTR(hostname),NULLSTR(username),NULLSTR(sessionid),NULLSTR(virtual_repository),NULLSTR(physical_repository),NULLSTR(client_version)); if(g_pDb->Error()) { CServerIo::error("audit_trigger error (session): %s\n",g_pDb->ErrorString()); delete g_pDb; g_pDb = NULL; --- 188,205 ---- time_t d = get_date((char*)date,NULL); char dt[64]; cvs::string tbl; + cvs::string sqlcmd; + sqlcmd.resize(2048); cvs::sprintf(tbl,80,"%sSessionLog",g_szPrefix); + cvs::sprintf(sqlcmd,2048,"Insert Into %%s (Command, Date, Hostname, Username, SessionId, VirtRepos, PhysRepos, Client) Values ('%%s','%%s','%%s','%%s','%%s','%%s','%%s','%%s')"); strftime(dt,sizeof(dt),"%Y-%m-%d %H:%M:%S",localtime(&d)); ! CServerIo::trace(3,sqlcmd.c_str(), ! tbl.c_str(),NULLSTR(command),dt,NULLSTR(hostname),NULLSTR(username),NULLSTR(sessionid),NULLSTR(virtual_repository),NULLSTR(physical_repository),NULLSTR(client_version)); ! g_pDb->Execute(sqlcmd.c_str(), tbl.c_str(),NULLSTR(command),dt,NULLSTR(hostname),NULLSTR(username),NULLSTR(sessionid),NULLSTR(virtual_repository),NULLSTR(physical_repository),NULLSTR(client_version)); if(g_pDb->Error()) { + CServerIo::trace(3,"audit_trigger error (session)\n"); CServerIo::error("audit_trigger error (session): %s\n",g_pDb->ErrorString()); delete g_pDb; g_pDb = NULL;