[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1217-g3be12b1

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  3be12b15f1758b54456d49368dbca7f25a99f4cc (commit)
      from  e873995e31e2f04e708194287a64c66a32cc4948 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 3be12b15f1758b54456d49368dbca7f25a99f4cc
Author: Matt Kraai <mkraai at beckman.com>
Date:   Wed Aug 12 08:49:24 2009 +0200

    libreplace: undef AI_ADDRCONFIG on QNX 6.3.0 (fix bug #6630)
    
    Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG.  On QNX
    6.3.0, this macro is defined but, if it's used, getaddrinfo will fail.  This
    prevents smbd from opening any sockets.
    
    If I undefine AI_ADDRCONFIG on such systems and allow
    lib/replace/system/network.h to define it to be 0, this works around the issue.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 91d13b68be55728a85b3832e2da9267dbf4f2464)
    
    Fixes bug #6630.

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/system/network.h |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 6add99c..4fe1084 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -195,6 +195,20 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]);
 #endif
 #endif
 
+/*
+ * Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX
+ * 6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This
+ * prevents smbd from opening any sockets.
+ *
+ * If I undefine AI_ADDRCONFIG on such systems and define it to be 0,
+ * this works around the issue.
+ */
+#ifdef __QNX__
+#include <sys/neutrino.h>
+#if _NTO_VERSION == 630
+#undef AI_ADDRCONFIG
+#endif
+#endif
 #ifndef AI_ADDRCONFIG
 /*
  * logic copied from AI_NUMERICHOST


-- 
Samba Shared Repository