[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  dbbfad8... s4-waf: add the missing bits for builing nss_winbind and pam_winbind
      from  e461e29... s4 unittests: add blackblox test for ktpass

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


- Log -----------------------------------------------------------------
commit dbbfad82862343eed0be86c8ca4fa23bdff5beb5
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Jun 5 19:16:20 2010 +0400

    s4-waf: add the missing bits for builing nss_winbind and pam_winbind
    
    This is something that was not picked up during the migration to waf

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

Summary of changes:
 lib/iniparser/wscript_build |    7 +++++++
 nsswitch/wscript_build      |   12 ++++++++++++
 source4/wscript_build       |    1 +
 3 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 lib/iniparser/wscript_build


Changeset truncated at 500 lines:

diff --git a/lib/iniparser/wscript_build b/lib/iniparser/wscript_build
new file mode 100644
index 0000000..419c232
--- /dev/null
+++ b/lib/iniparser/wscript_build
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+bld.SAMBA_SUBSYSTEM('LIBINIPARSER',
+                    source='../iniparser_build/iniparser.c ../iniparser_build/dictionary.c ../iniparser_build/strlib.c',
+                    deps='replace',
+                    cflags=''
+                    )
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 80f1187..9303ace 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -18,3 +18,15 @@ bld.SAMBA_BINARY('wbinfo',
 	deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
 	)
 
+bld.SAMBA_LIBRARY('nsswinbind',
+    source='../nsswitch/winbind_nss_linux.c',
+    deps='LIBWINBIND-CLIENT',
+    realname='libnss_winbind.so',
+    vnum='2')
+
+bld.SAMBA_LIBRARY('pamwinbind',
+    source='../nsswitch/pam_winbind.c',
+    deps='talloc LIBWBCLIENT LIBWINBIND-CLIENT LIBINIPARSER pam',
+    cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
+    realname='pam_winbind.so',
+    )
diff --git a/source4/wscript_build b/source4/wscript_build
index 6c1eac6..c8c14bc 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -56,6 +56,7 @@ bld.RECURSE('cluster')
 bld.RECURSE('smbd')
 bld.RECURSE('libnet')
 bld.RECURSE('auth')
+bld.RECURSE('../lib/iniparser')
 bld.RECURSE('../nsswitch')
 bld.RECURSE('../nsswitch/libwbclient')
 bld.RECURSE('lib/samba3')


-- 
Samba Shared Repository