diff options
| author | Ira Cooper <ira@samba.org> | 2012-09-30 19:02:13 +0000 |
|---|---|---|
| committer | Ira Cooper <ira@samba.org> | 2012-09-30 22:56:29 +0200 |
| commit | 6dbe0aad260d1f6e46e58871a7ce613ca27d0bf6 (patch) | |
| tree | 19aa0e9e14210e4c88575d825e7e7562a612e721 | |
| parent | 81805222ec7a652e188bd106199820570c9dcaad (diff) | |
| download | samba-6dbe0aad260d1f6e46e58871a7ce613ca27d0bf6.tar.gz samba-6dbe0aad260d1f6e46e58871a7ce613ca27d0bf6.tar.bz2 samba-6dbe0aad260d1f6e46e58871a7ce613ca27d0bf6.zip | |
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@samba.org>
Autobuild-Date(master): Sun Sep 30 22:56:30 CEST 2012 on sn-devel-104
| -rw-r--r-- | nsswitch/winbind_nss_solaris.c | 6 | ||||
| -rw-r--r-- | nsswitch/wscript_build | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/nsswitch/winbind_nss_solaris.c b/nsswitch/winbind_nss_solaris.c index 5fb37643ce..92da8591b7 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 0802687eeb..3931445ea1 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', |