[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  05d00ed nsswitch: Fix build check logic
      from  ecc030e selftest: Polish selftest-vars.sh a little so it can be used again

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


- Log -----------------------------------------------------------------
commit 05d00ed479e99dea28aead113a3de33546b44526
Author: Kai Blin <kai at samba.org>
Date:   Sun May 8 21:50:34 2011 +0200

    nsswitch: Fix build check logic
    
    Only build pam_winbind.so if we want pam modules _and_ have the libs
    
    Autobuild-User: Kai Blin <kai at samba.org>
    Autobuild-Date: Sun May  8 23:56:33 CEST 2011 on sn-devel-104

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

Summary of changes:
 nsswitch/wscript_build |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 83b10a7..47f6fbc 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -21,7 +21,7 @@ bld.SAMBA_LIBRARY('nss_winbind',
 	vnum='2')
 
 
-if bld.CONFIG_SET('WITH_PAM_MODULES') or bld.CONFIG_SET('HAVE_PAM_START'):
+if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
 	bld.SAMBA_LIBRARY('pamwinbind',
 		source='pam_winbind.c',
 		deps='intl talloc wbclient winbind-client LIBINIPARSER pam',


-- 
Samba Shared Repository