[SCM] Samba Shared Repository - branch master updated

[Ira Cooper]

The branch, master has been updated
       via  6dbe0aa s3: Fix libnss_winbind.so's build on Illumos/Solaris
      from  8180522 s4 dns: Fix return code for deleted records

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


- Log -----------------------------------------------------------------
commit 6dbe0aad260d1f6e46e58871a7ce613ca27d0bf6
Author: Ira Cooper <ira at samba.org>
Date:   Sun Sep 30 19:02:13 2012 +0000

    s3: Fix libnss_winbind.so's build on Illumos/Solaris
    
    Due to not building and linking in the winbind_nss_solaris bits in addition
    to the linux bits, nss was broken on Solaris.
    
    Autobuild-User(master): Ira Cooper <ira at samba.org>
    Autobuild-Date(master): Sun Sep 30 22:56:30 CEST 2012 on sn-devel-104

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

Summary of changes:
 nsswitch/winbind_nss_solaris.c |    6 ++++++
 nsswitch/wscript_build         |   21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/winbind_nss_solaris.c b/nsswitch/winbind_nss_solaris.c
index 5fb3764..92da859 100644
--- a/nsswitch/winbind_nss_solaris.c
+++ b/nsswitch/winbind_nss_solaris.c
@@ -26,6 +26,7 @@
 
 #undef DEVELOPER
 
+
 #include "winbind_client.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -34,6 +35,7 @@
 #include <pwd.h>
 #include "includes.h"
 #include <syslog.h>
+
 #if !defined(HPUX)
 #include <sys/syslog.h>
 #endif /*hpux*/
@@ -48,6 +50,10 @@
 #define NSS_DEBUG(str) ;
 #endif
 
+#if !defined(SMB_MALLOC_P)
+#define SMB_MALLOC_P(type) (type *)malloc(sizeof(type))
+#endif
+
 #define NSS_ARGS(args) ((nss_XbyY_args_t *)args)
 
 #ifdef HPUX
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 0802687..3931445 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import Utils
 
 bld.SAMBA_LIBRARY('winbind-client',
 	source='wb_common.c',
@@ -13,13 +14,19 @@ bld.SAMBA_BINARY('nsstest',
 	deps='replace dl'
 	)
 
-
-bld.SAMBA_LIBRARY('nss_winbind',
-	source='winbind_nss_linux.c',
-	deps='winbind-client',
-	realname='libnss_winbind.so.2',
-	vnum='2')
-
+if Utils.unversioned_sys_platform() == 'linux':
+	bld.SAMBA_LIBRARY('nss_winbind',
+		source='winbind_nss_linux.c',
+		deps='winbind-client',
+		realname='libnss_winbind.so.2',
+		vnum='2')
+
+if Utils.unversioned_sys_platform() == 'sunos':
+	bld.SAMBA_LIBRARY('nss_winbind',
+		source='winbind_nss_solaris.c winbind_nss_linux.c',
+		deps='winbind-client',
+		realname='libnss_winbind.so.2',
+		vnum='2')
 
 if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
 	bld.SAMBA_LIBRARY('pamwinbind',


-- 
Samba Shared Repository