[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  24cac44 build: change lib order to fix build on netbsd
       via  864335e build: add a check for _ss_family as it used on aix to replace ss_family
       via  993b4aa replace: add comments to make the #ifdef/#else/endif more readable
      from  6bc6c00 selftest-s4: Support listing smbtorture4 tests.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 24cac449a1910ce55cbc5e83180b6dd89940223f
Author: Matthieu Patou <mat at matws.net>
Date:   Sun Dec 12 12:06:31 2010 +0300

    build: change lib order to fix build on netbsd
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sun Dec 12 10:54:02 CET 2010 on sn-devel-104

commit 864335ec186e08bca8d9404167d9337695ee6614
Author: Matthieu Patou <mat at matws.net>
Date:   Sun Dec 12 12:05:43 2010 +0300

    build: add a check for _ss_family as it used on aix to replace ss_family

commit 993b4aa07e35b612a4f9b6eddecae704b8e01aaa
Author: Matthieu Patou <mat at matws.net>
Date:   Sun Dec 12 12:04:51 2010 +0300

    replace: add comments to make the #ifdef/#else/endif more readable

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

Summary of changes:
 lib/replace/system/network.h |    6 +++---
 lib/replace/wscript          |    2 ++
 nsswitch/wscript_build       |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 93d533c..f7c1bcf 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -307,12 +307,12 @@ typedef unsigned short int sa_family_t;
 #define sockaddr_storage sockaddr_in6
 #define ss_family sin6_family
 #define HAVE_SS_FAMILY 1
-#else
+#else /*HAVE_STRUCT_SOCKADDR_IN6*/
 #define sockaddr_storage sockaddr_in
 #define ss_family sin_family
 #define HAVE_SS_FAMILY 1
-#endif
-#endif
+#endif /*HAVE_STRUCT_SOCKADDR_IN6*/
+#endif /*HAVE_STRUCT_SOCKADDR_STORAGE*/
 
 #ifndef HAVE_SS_FAMILY
 #ifdef HAVE___SS_FAMILY
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 86a4bdb..7b30940 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -308,6 +308,8 @@ def configure(conf):
                                 headers='sys/stat.h')
     conf.CHECK_STRUCTURE_MEMBER('struct sockaddr_storage', 'ss_family',
                                 headers='sys/socket.h netinet/in.h')
+    conf.CHECK_STRUCTURE_MEMBER('struct sockaddr_storage', '_ss_family',
+                                headers='sys/socket.h netinet/in.h')
 
 
     if conf.CHECK_STRUCTURE_MEMBER('struct sockaddr', 'sa_len',
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 223e24d..184d20e 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -28,7 +28,7 @@ bld.SAMBA_LIBRARY('nss_winbind',
 if bld.CONFIG_SET('HAVE_PAM_START'):
 	bld.SAMBA_LIBRARY('pamwinbind',
 		source='../nsswitch/pam_winbind.c',
-		deps='talloc wbclient winbind-client LIBINIPARSER pam intl',
+		deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
 		cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
 		realname='pam_winbind.so',
 		)


-- 
Samba Shared Repository