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

[Günther Deschner]

The branch, v3-6-test has been updated
       via  6170738 s3-waf: add --with-pam_smbpass configure option.
       via  b24e02d s3-waf: move HAVE_LDAP_SASL_WRAPPING define to the HAVE_LDAP block.
       via  2aabdf5 s4-smbtorture: more torture_fail usage in raw.write test.
      from  f76be33 s3-username: rename static getpwnam_alloc to getpwnam_alloc_cached.

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


- Log -----------------------------------------------------------------
commit 6170738283bf1caf448ebd2e9bb4dd01c8e4d706
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 17 14:07:50 2011 +0100

    s3-waf: add --with-pam_smbpass configure option.
    
    We build pam_smbpass independent from this configure option though.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Mar 17 14:52:33 CET 2011 on sn-devel-104
    (cherry picked from commit 1413af95fc1512adb62e4295b029d9248d94683d)

commit b24e02d6de2db21c08a30e466a55ccaed574bbd7
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 17 14:05:48 2011 +0100

    s3-waf: move HAVE_LDAP_SASL_WRAPPING define to the HAVE_LDAP block.
    
    Guenther
    (cherry picked from commit 7bc381bdc57681b0822f3af22945b8bec3941ce7)

commit 2aabdf5ab02487d0ca82046f4205ea17124e80a9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 17 12:25:25 2011 +0100

    s4-smbtorture: more torture_fail usage in raw.write test.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Mar 17 13:10:14 CET 2011 on sn-devel-104
    (cherry picked from commit 717beda638e84902ef9b78eb37e0d8e85672ffd3)

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

Summary of changes:
 source3/wscript             |   11 ++++++-----
 source4/torture/raw/write.c |   12 ++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 508f270..c9ee928 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -46,6 +46,7 @@ def set_options(opt):
     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('pam_smbpass')
     opt.SAMBA3_ADD_OPTION('quotas')
     opt.SAMBA3_ADD_OPTION('sys-quotas')
     opt.SAMBA3_ADD_OPTION('sendfile-support')
@@ -560,11 +561,6 @@ msg.msg_acctrightslen = sizeof(fd);
         conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
         conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
         conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
-        # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
-        # SASL wrapping hooks
-        if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
-                conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
-            conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
 
         # if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out
         # for the samba logs
@@ -588,6 +584,11 @@ msg.msg_acctrightslen = sizeof(fd);
             conf.DEFINE('HAVE_LDAP', '1')
             conf.DEFINE('LDAP_DEPRECATED', '1')
             conf.env['HAVE_LDAP'] = '1'
+            # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
+            # SASL wrapping hooks
+            if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
+                    conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
+                conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
     else:
         conf.SET_TARGET_TYPE('ldap', 'EMPTY')
         conf.SET_TARGET_TYPE('lber', 'EMPTY')
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index d3d21c5..8e564d7 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -27,16 +27,16 @@
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
-		torture_comment(tctx, "(%s) Incorrect status %s - should be %s\n", \
-		       __location__, nt_errstr(status), nt_errstr(correct)); \
+		torture_fail(tctx, talloc_asprintf(tctx, "(%s) Incorrect status %s - should be %s\n", \
+		       __location__, nt_errstr(status), nt_errstr(correct))); \
 		ret = false; \
 		goto done; \
 	}} while (0)
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
-		torture_comment(tctx, "(%s) Incorrect value %s=%d - should be %d\n", \
-		       __location__, #v, v, correct); \
+		torture_fail(tctx, talloc_asprintf(tctx, "(%s) Incorrect value %s=%d - should be %d\n", \
+		       __location__, #v, v, correct)); \
 		ret = false; \
 		goto done; \
 	}} while (0)
@@ -84,8 +84,8 @@ static bool check_buffer(struct torture_context *tctx,
 	for (i=0;i<len;i++) {
 		uint8_t v = random();
 		if (buf[i] != v) {
-			torture_comment(tctx, "Buffer incorrect at %s! ofs=%d buf=0x%x correct=0x%x\n",
-			       location, i, buf[i], v);
+			torture_fail(tctx, talloc_asprintf(tctx, "Buffer incorrect at %s! ofs=%d buf=0x%x correct=0x%x\n",
+			       location, i, buf[i], v));
 			return false;
 		}
 	}


-- 
Samba Shared Repository