[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  0074c85 s3-waf: add --with-syslog option.
       via  2840157 s3-netlogon: fix typo.
       via  6504933 s3-waf: recurse into ../lib/util/wscript_configure
       via  c4ed33d s3-waf: add support for iprint.
      from  a1902c2 s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 0074c8505dffd5967e2c7269d81dfb96eea35729
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 4 17:42:10 2011 +0100

    s3-waf: add --with-syslog option.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Feb  7 10:50:39 CET 2011 on sn-devel-104
    (cherry picked from commit 81a3f7a5207d8e97e324578e7385303e9b7e8b3d)

commit 28401574a384173ed089ee473b422ac0a66ef697
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 4 17:31:13 2011 +0100

    s3-netlogon: fix typo.
    
    Guenther
    (cherry picked from commit f1d51aa6f24fd30e719c661f7790e5ecc502cb2d)

commit 6504933ea3f67a8faf471f4ee7f63bbe1f071df1
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 4 17:27:26 2011 +0100

    s3-waf: recurse into ../lib/util/wscript_configure
    
    This gets us all the statvfs checks.
    
    Guenther
    (cherry picked from commit 45f86fd681c5413146303fbab49d1deceee8103b)

commit c4ed33decfb7886fe36e0df178972c44c5fc6d93
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 4 16:49:30 2011 +0100

    s3-waf: add support for iprint.
    
    Guenther
    (cherry picked from commit 72910c34dff23958587f73ac27e38d6e92cb7bea)

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

Summary of changes:
 source3/rpc_server/srv_netlog_nt.c |    2 +-
 source3/wscript                    |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 397c658..b366af7 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -1494,7 +1494,7 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
 		if (*wksname == '\\') wksname++;
 		if (*wksname == '\\') wksname++;
 
-		/* Standard challenge/response authenticaion */
+		/* Standard challenge/response authentication */
 		if (!make_user_info_netlogon_network(&user_info,
 						     nt_username, nt_domain,
 						     wksname,
diff --git a/source3/wscript b/source3/wscript
index 61e00aa..af54550 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -41,6 +41,7 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('krb5')
     opt.SAMBA3_ADD_OPTION('ldap')
     opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
+    opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('merged-build', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('pam')
     opt.SAMBA3_ADD_OPTION('quotas')
@@ -52,6 +53,7 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('iconv')
     opt.SAMBA3_ADD_OPTION('acl-support')
     opt.SAMBA3_ADD_OPTION('dnsupdate')
+    opt.SAMBA3_ADD_OPTION('syslog')
 
 
 def configure(conf):
@@ -84,6 +86,7 @@ def configure(conf):
     conf.RECURSE('../lib/socket_wrapper')
     conf.RECURSE('../lib/zlib')
     conf.RECURSE('../libcli/smbreadline')
+    conf.RECURSE('../lib/util')
 
     conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
 
@@ -548,6 +551,15 @@ return acl_get_perm_np(permset_d, perm);
         # define an empty subsystem for cups, to allow it to be used as an empty dependency
         conf.SET_TARGET_TYPE('cups', 'EMPTY')
 
+    if Options.options.with_iprint:
+	if conf.CONFIG_SET('HAVE_CUPS'):
+            conf.DEFINE('HAVE_IPRINT', '1')
+        else:
+            print "--enable-iprint=yes but cups support not sufficient"
+            sys.exit(1)
+    if Options.options.with_syslog:
+        conf.DEFINE('WITH_SYSLOG', '1')
+
     # Check for LDAP
     if Options.options.with_ldap:
         conf.CHECK_HEADERS('ldap.h lber.h')


-- 
Samba Shared Repository