Ticket #191: jabberd.patch
| File jabberd.patch, 9.2 KB (added by pogma, 11 months ago) |
|---|
-
configure.ac
old new 92 94 fcntl.h \ 93 95 netinet/in.h \ 94 96 signal.h \ 97 stdarg.h \ 95 98 stdint.h \ 96 99 stdlib.h \ 97 100 string.h \ … … 142 145 AC_FUNC_CLOSEDIR_VOID 143 146 AC_REPLACE_FNMATCH 144 147 AC_FUNC_FORK 145 AC_PROG_GCC_TRADITIONAL146 AC_FUNC_MALLOC147 148 AC_FUNC_MEMCMP 148 149 AC_FUNC_MKTIME 149 AC_FUNC_REALLOC150 150 AC_FUNC_SELECT_ARGTYPES 151 151 AC_TYPE_SIGNAL 152 152 AC_FUNC_STAT … … 209 209 fi 210 210 fi 211 211 212 AC_SEARCH_LIBS(inet_ntop, nsl,[ 213 AC_DEFINE(HAVE_INET_NTOP, 1, 214 [Define to 1 if you have the `inet_ntop' function.])]) 215 216 dnl ** Check for inet_ntop 217 AC_SEARCH_LIBS(inet_pton, nsl,[ 218 AC_DEFINE(HAVE_INET_PTON, 1, 219 [Define to 1 if you have the `inet_pton' function.])]) 220 212 221 # windows has different names for a few basic things 213 222 if test "x-$ac_cv_func_getpid" != "x-yes" -a "x-$ac_cv_func__getpid" = "x-yes" ; then 214 223 AC_DEFINE(getpid,_getpid,[Define to a function than can provide getpid(2) functionality.]) … … 296 305 AC_MSG_ERROR([no DNS resolver interface (res_query or DnsQuery) found]) 297 306 fi 298 307 299 # inet_ntop/inet_pton have been seen in -lnsl, and sometimes not at all300 AC_CHECK_FUNC(inet_ntop, ,[AC_CHECK_LIB(nsl, inet_ntop)])301 unset ac_cv_func_inet_ntop302 AC_CHECK_FUNCS(inet_ntop inet_pton)303 304 # some glibcs have broken sockaddr_storage members305 if test "x-$ac_cv_type_struct_sockaddr_storage" = "x-yes" ; then306 AC_MSG_CHECKING(for broken __ss_family member in struct sockaddr_storage)307 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(_IP6_INCLUDES,308 [[do {309 struct sockaddr_storage s;310 s.__ss_family = 0;311 } while(0)]])],312 [AC_MSG_RESULT(yes)313 AC_DEFINE(ss_family, __ss_family,314 [Define to '__ss_family' if 'struct sockaddr_storage' defines '__ss_family' instead of 'ss_family'.])],315 AC_MSG_RESULT(no))316 317 AC_MSG_CHECKING(for broken __ss_len member in struct sockaddr_storage)318 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(_IP6_INCLUDES,319 [[do {320 struct sockaddr_storage s;321 s.__ss_len = 0;322 } while(0)]])],323 [AC_MSG_RESULT(yes)324 AC_DEFINE(ss_len, __ss_len,325 [Define to '__ss_len' if 'struct sockaddr_storage' defines '__ss_len' instead of 'ss_len'.])],326 AC_MSG_RESULT(no))327 fi328 329 330 308 # syslog 331 309 if test "x-$ac_cv_header_syslog_h" = "x-yes" ; then 332 310 AC_CHECK_FUNCS(syslog vsyslog) … … 366 344 [AC_MSG_RESULT(no) 367 345 AC_DEFINE(HAVE_BROKEN_VSNPRINTF,1,[Define to 1 if 'vsnprintf' cannot handle NULL arguments.])]) 368 346 fi 369 347 TYPE_SOCKLEN_T 370 348 # 371 349 # Checks for libraries. 372 350 … … 584 562 # PostgreSQL 585 563 AC_ARG_ENABLE([pgsql], 586 564 AC_HELP_STRING([--enable-pgsql[=DIR]], [enable PostgreSQL auth/reg/storage support (no)]), 587 [ enable_pgsql="$enableval" have_pgsql=no PGSQL_PREFIX=" enableval"],565 [ enable_pgsql="$enableval" have_pgsql=no PGSQL_PREFIX="$enableval"], 588 566 [ enable_pgsql=no have_pgsql=no ]) 589 567 if test "x-$enable_pgsql" != "x-no" ; then 590 568 if test "$PGSQL_PREFIX" = "yes" ; then … … 836 814 # these types are sometimes missing 837 815 AC_CHECK_TYPES([in_port_t, sa_family_t, struct sockaddr_storage, struct sockaddr_in6, struct in6_addr],,, _IP6_INCLUDES) 838 816 817 # some glibcs have broken sockaddr_storage members 818 if test "x-$ac_cv_type_struct_sockaddr_storage" = "x-yes" ; then 819 AC_MSG_CHECKING(for broken __ss_family member in struct sockaddr_storage) 820 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(_IP6_INCLUDES, 821 [[do { 822 struct sockaddr_storage s; 823 s.__ss_family = 0; 824 } while(0)]])], 825 [AC_MSG_RESULT(yes) 826 AC_DEFINE(ss_family, __ss_family, 827 [Define to '__ss_family' if 'struct sockaddr_storage' defines '__ss_family' instead of 'ss_family'.])], 828 AC_MSG_RESULT(no)) 829 830 AC_MSG_CHECKING(for broken __ss_len member in struct sockaddr_storage) 831 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(_IP6_INCLUDES, 832 [[do { 833 struct sockaddr_storage s; 834 s.__ss_len = 0; 835 } while(0)]])], 836 [AC_MSG_RESULT(yes) 837 AC_DEFINE(ss_len, __ss_len, 838 [Define to '__ss_len' if 'struct sockaddr_storage' defines '__ss_len' instead of 'ss_len'.])], 839 AC_MSG_RESULT(no)) 840 fi 841 842 839 843 # 840 844 # mio backend selection 841 845 -
util/sha1.h
old new 48 48 49 49 #else 50 50 51 #include < stdint.h>51 #include <inttypes.h> 52 52 53 53 typedef struct sha1_state_s { 54 54 uint32_t H[5]; -
acinclude.m4
old new 491 491 EOF 492 492 ]) 493 493 494 dnl Check for socklen_t: historically on BSD it is an int, and in 495 dnl POSIX 1g it is a type of its own, but some platforms use different 496 dnl types for the argument to getsockopt, getpeername, etc. So we 497 dnl have to test to find something that will work. 498 AC_DEFUN([TYPE_SOCKLEN_T], 499 [ 500 AC_CHECK_TYPE([socklen_t], ,[ 501 AC_MSG_CHECKING([for socklen_t equivalent]) 502 AC_CACHE_VAL([socklen_t_equiv], 503 [ 504 # Systems have either "struct sockaddr *" or 505 # "void *" as the second argument to getpeername 506 socklen_t_equiv= 507 for arg2 in "struct sockaddr" void; do 508 for t in int size_t unsigned long "unsigned long"; do 509 AC_TRY_COMPILE([ 510 #include <sys/types.h> 511 #include <sys/socket.h> 512 513 int getpeername (int, $arg2 *, $t *); 514 ],[ 515 $t len; 516 getpeername(0,0,&len); 517 ],[ 518 socklen_t_equiv="$t" 519 break 520 ]) 521 done 522 done 523 524 if test "x$socklen_t_equiv" = x; then 525 AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) 526 fi 527 ]) 528 AC_MSG_RESULT($socklen_t_equiv) 529 AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv, 530 [type to use in place of socklen_t if not defined])], 531 [#include <sys/types.h> 532 #include <sys/socket.h>]) 533 ]) 534 494 535 dnl quote from SunOS-5.8 sys/inttypes.h: 495 536 dnl Use at your own risk. As of February 1996, the committee is squarely 496 537 dnl behind the fixed sized types; the "least" and "fast" types are still being -
subst/subst.h
old new 26 26 #ifdef HAVE_CONFIG_H 27 27 # include <config.h> 28 28 #endif 29 29 #if defined (HAVE_STDARG_H) 30 #include <stdarg.h> 31 #endif 30 32 /* jabberd2 Windows DLL */ 31 33 #ifndef JABBERD2_API 32 34 # ifdef _WIN32 -
mio/mio.h
old new 24 24 #ifdef HAVE_CONFIG_H 25 25 # include <config.h> 26 26 #endif 27 27 #include "util/inaddr.h" 28 28 #include "ac-stdint.h" 29 29 30 30 /* jabberd2 Windows DLL */ -
c2s/c2s.c
old new 962 962 break; 963 963 } 964 964 if(bres == NULL) { 965 jid_t jid; 966 bres_t tres; 967 965 968 /* if it's a failure, just drop it */ 966 969 if(nad_find_attr(nad, 1, ns, "failed", NULL) >= 0) { 967 970 nad_free(nad); … … 969 972 } 970 973 971 974 /* build temporary resource to close session for */ 972 jid _t jid= jid_new(sess->c2s->pc, sess->s->auth_id, -1);973 bres_ttres = (bres_t) calloc(1, sizeof(struct bres_st));975 jid = jid_new(sess->c2s->pc, sess->s->auth_id, -1); 976 tres = (bres_t) calloc(1, sizeof(struct bres_st)); 974 977 tres->jid = jid; 975 978 sprintf(tres->c2s_id, "%d", sess->s->tag); 976 979 snprintf(tres->sm_id, 41, "%.*s", NAD_AVAL_L(nad, smid), NAD_AVAL(nad, smid));
