[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Rusty Russell 
The branch, master has been updated
   via  583ffea lib/tdb: fix tests for standalone out-of-tree.
  from  7320a5c samba.tests.samba_tool.base: Avoid unnecessary call to 
testtools.matchers.Contains.

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


- Log -
commit 583ffeae404cc632eebc43fed054391a59dffee2
Author: Rusty Russell 
Date:   Sat Mar 10 14:08:48 2012 +1030

lib/tdb: fix tests for standalone out-of-tree.

Commit 4d58d0fa8f936e7efdc02e31c053d42a47b3e62a didn't work for lib/tdb
outside the build tree: symlink was pointing to wrong place.

Copy simplification from lib/tdb2, and fix the build farm.

Signed-off-by: Rusty Russell 

Autobuild-User: Rusty Russell 
Autobuild-Date: Sat Mar 10 07:07:45 CET 2012 on sn-devel-104

---

Summary of changes:
 lib/tdb/wscript |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 9eeb3c8..871c5c4 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -183,7 +183,8 @@ def testonly(ctx):
 # Symlink back to source dir so it can find tests in test/
 link = os.path.join(testdir, 'test')
 if not os.path.exists(link):
-
os.symlink(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path),
 Utils.g_module.srcdir, 'lib', 'tdb', 'test'))), link)
+os.symlink(os.path.abspath(os.path.join(env.cwd, 'test')), link)
+
 for f in 'tdb1-run-3G-file', 'tdb1-run-bad-tdb-header', 'tdb1-run', 
'tdb1-run-check', 'tdb1-run-corrupt', 'tdb1-run-die-during-transaction', 
'tdb1-run-endian', 'tdb1-run-incompatible', 'tdb1-run-nested-transactions', 
'tdb1-run-nested-traverse', 'tdb1-run-no-lock-during-traverse', 
'tdb1-run-oldhash', 'tdb1-run-open-during-transaction', 
'tdb1-run-readonly-check', 'tdb1-run-rwlock-check', 'tdb1-run-summary', 
'tdb1-run-transaction-expand', 'tdb1-run-traverse-in-transaction', 
'tdb1-run-wronghash-fail', 'tdb1-run-zero-append':
 cmd = "cd " + testdir + " && " + 
os.path.abspath(os.path.join(Utils.g_module.blddir, f)) + " > test-output 2>&1"
 print("..." + f)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Jelmer Vernooij 
The branch, master has been updated
   via  7320a5c samba.tests.samba_tool.base: Avoid unnecessary call to 
testtools.matchers.Contains.
   via  b703267 samba.tests.samba_tool.user: Remove unused imports.
  from  981e977 Ensure the right tsocket.h is included.

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


- Log -
commit 7320a5c900a263794cf1a4de55ce786e0f8fa317
Author: Jelmer Vernooij 
Date:   Sat Mar 10 00:23:40 2012 +0100

samba.tests.samba_tool.base: Avoid unnecessary call to 
testtools.matchers.Contains.

Autobuild-User: Jelmer Vernooij 
Autobuild-Date: Sat Mar 10 05:27:51 CET 2012 on sn-devel-104

commit b703267dfc731d659453e56aa54e49cc4e442f98
Author: Jelmer Vernooij 
Date:   Sat Mar 10 00:23:18 2012 +0100

samba.tests.samba_tool.user: Remove unused imports.

---

Summary of changes:
 .../python/samba/tests/samba_tool/base.py  |3 +--
 .../python/samba/tests/samba_tool/user.py  |2 --
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/tests/samba_tool/base.py 
b/source4/scripting/python/samba/tests/samba_tool/base.py
index 628fd6c..489d6b5 100644
--- a/source4/scripting/python/samba/tests/samba_tool/base.py
+++ b/source4/scripting/python/samba/tests/samba_tool/base.py
@@ -28,7 +28,6 @@ from samba.samdb import SamDB
 from cStringIO import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests
-from testtools.matchers import Contains
 
 class SambaToolCmdTest(samba.tests.TestCase):
 
@@ -89,7 +88,7 @@ class SambaToolCmdTest(samba.tests.TestCase):
 self.assertIsNotNone(val, msg)
 
 def assertMatch(self, base, string, msg=""):
-self.assertThat(base, Contains(string), msg)
+self.assertTrue(string in base, msg)
 
 def randomName(self, count=8):
 """Create a random name, cap letters and numbers, and always starting 
with a letter"""
diff --git a/source4/scripting/python/samba/tests/samba_tool/user.py 
b/source4/scripting/python/samba/tests/samba_tool/user.py
index 4fe43e5..2e7c2b9 100644
--- a/source4/scripting/python/samba/tests/samba_tool/user.py
+++ b/source4/scripting/python/samba/tests/samba_tool/user.py
@@ -18,8 +18,6 @@
 #
 
 import os
-import sys
-import pprint
 import time
 import ldb
 from samba.tests.samba_tool.base import SambaToolCmdTest


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Jeremy Allison 
The branch, master has been updated
   via  981e977 Ensure the right tsocket.h is included.
   via  97e1652 Fix up Christian Ambach's multi-credit code - the 
CreditCharge field is a 16-bit int read, not a 32-bit one.
   via  6e8e3c4 s3:smb2_server validate message ids with largemtu
   via  f6afda0 s3:smb2_server verify creditcharge
   via  eec5ece s3:smb2_server add function to verify creditcharge
   via  bd0ad2b s3:smb2_server: announce LargeMTU for SMB2.1
   via  6d128aa s3:smb2_server increase defaults for read/write/trans sizes 
to 1MB
   via  7f131d3 s3:smb2_server: add supports_multicredit to sconn
   via  880f64b s3:smb2_server use the correct variables for max read/write
  from  1e8141f Fix bug #8797 - Samba does not correctly handle DENY ACEs 
when privileges apply. Signed-off-by: Jeremy Allison 

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


- Log -
commit 981e9776f84dcf03f0297f47f63ee548ca089c0f
Author: Jeremy Allison 
Date:   Fri Mar 9 17:08:36 2012 -0800

Ensure the right tsocket.h is included.

Autobuild-User: Jeremy Allison 
Autobuild-Date: Sat Mar 10 03:47:04 CET 2012 on sn-devel-104

commit 97e1652125a46ffbc1510b26abb0379d7df690d3
Author: Jeremy Allison 
Date:   Fri Mar 9 16:47:21 2012 -0800

Fix up Christian Ambach's multi-credit code - the CreditCharge field is a 
16-bit int read, not a 32-bit one.

commit 6e8e3c46130ce5882a3bd06bcccf4c383280e583
Author: Christian Ambach 
Date:   Mon Feb 27 17:53:04 2012 -0800

s3:smb2_server validate message ids with largemtu

Signed-off-by: Jeremy Allison 

commit f6afda0bc867f1080c45e1f6f79d5032c41d2b1a
Author: Christian Ambach 
Date:   Mon Feb 27 17:51:40 2012 -0800

s3:smb2_server verify creditcharge

for all requests that have max_ checks, also do a check of the
creditcharge the client has sent (when using largemtu)

Signed-off-by: Jeremy Allison 

commit eec5ece6f59c5ff30de88af0e182c3b2f7b9579c
Author: Christian Ambach 
Date:   Mon Feb 27 17:49:12 2012 -0800

s3:smb2_server add function to verify creditcharge

Signed-off-by: Jeremy Allison 

commit bd0ad2bbb5361a92f349ef42171b9bdd1d99b281
Author: Christian Ambach 
Date:   Mon Feb 27 05:57:47 2012 -0800

s3:smb2_server: announce LargeMTU for SMB2.1

Signed-off-by: Jeremy Allison 

commit 6d128aac119d948f0ecb0dcf6b400b4eb4027fe6
Author: Christian Ambach 
Date:   Mon Feb 27 21:33:13 2012 -0800

s3:smb2_server increase defaults for read/write/trans sizes to 1MB

Signed-off-by: Jeremy Allison 

commit 7f131d3cee260e5943dc1e113b6eabb677fd4945
Author: Christian Ambach 
Date:   Mon Feb 27 17:45:09 2012 -0800

s3:smb2_server: add supports_multicredit to sconn

Signed-off-by: Jeremy Allison 

commit 880f64b5560b0b27d7f1313c8a78044d871d27ad
Author: Christian Ambach 
Date:   Mon Feb 27 05:56:57 2012 -0800

s3:smb2_server use the correct variables for max read/write

Signed-off-by: Jeremy Allison 

---

Summary of changes:
 source3/include/local.h |6 +-
 source3/smbd/globals.h  |4 ++
 source3/smbd/smb2_find.c|8 +++
 source3/smbd/smb2_getinfo.c |6 ++
 source3/smbd/smb2_negprot.c |   35 ++--
 source3/smbd/smb2_notify.c  |7 +++
 source3/smbd/smb2_read.c|5 ++
 source3/smbd/smb2_server.c  |  122 +--
 source3/smbd/smb2_setinfo.c |6 ++
 source3/smbd/smb2_write.c   |5 ++
 10 files changed, 168 insertions(+), 36 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/local.h b/source3/include/local.h
index 281248c..11166df 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -232,9 +232,9 @@
 #define CLIENT_NDR_PADDING_SIZE 8
 #define SERVER_NDR_PADDING_SIZE 8
 
-#define DEFAULT_SMB2_MAX_READ (64*1024)
-#define DEFAULT_SMB2_MAX_WRITE (64*1024)
-#define DEFAULT_SMB2_MAX_TRANSACT (64*1024)
+#define DEFAULT_SMB2_MAX_READ (1024*1024)
+#define DEFAULT_SMB2_MAX_WRITE (1024*1024)
+#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024)
 #define DEFAULT_SMB2_MAX_CREDITS 8192
 #define DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR 2
 
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 5b65711..caf7357 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -258,6 +258,9 @@ NTSTATUS smbd_smb2_request_pending_queue(struct 
smbd_smb2_request *req,
 struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req);
 void remove_smb2_chained_fsp(files_struct *fsp);
 
+NTSTATUS smbd_smb2_request_verify_creditcharge(struct smbd_smb2_request *req,
+  uint32_t data_length);
+
 NTSTATUS smbd_smb2_request_verify_sizes(struct smbd_smb2_request *req,
size_t expected_body_size);
 
@@ -590,6 +593,7 @@ stru

[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Jeremy Allison 
The branch, master has been updated
   via  1e8141f Fix bug #8797 - Samba does not correctly handle DENY ACEs 
when privileges apply. Signed-off-by: Jeremy Allison 
  from  177c61b s3: asprintf->talloc_asprintf

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


- Log -
commit 1e8141f40ae7b67a45906f26483caff0a7cca7ed
Author: Richard Sharpe 
Date:   Fri Mar 9 14:54:38 2012 -0800

Fix bug #8797 - Samba does not correctly handle DENY ACEs when privileges 
apply.
Signed-off-by: Jeremy Allison 

Autobuild-User: Jeremy Allison 
Autobuild-Date: Sat Mar 10 01:33:45 CET 2012 on sn-devel-104

---

Summary of changes:
 libcli/security/access_check.c |   54 ---
 1 files changed, 28 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index a9b618f..d9f6293 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -178,38 +178,12 @@ NTSTATUS se_access_check(const struct security_descriptor 
*sd,
bits_remaining));
}
 
-   /* s3 had this with #if 0 previously. To be sure the merge
-  doesn't change any behaviour, we have the above #if check
-  on _SAMBA_BUILD_. */
-   if (access_desired & SEC_FLAG_SYSTEM_SECURITY) {
-   if (security_token_has_privilege(token, SEC_PRIV_SECURITY)) {
-   bits_remaining &= ~SEC_FLAG_SYSTEM_SECURITY;
-   } else {
-   return NT_STATUS_PRIVILEGE_NOT_HELD;
-   }
-   }
-
/* the owner always gets SEC_STD_WRITE_DAC and SEC_STD_READ_CONTROL */
if ((bits_remaining & (SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL)) &&
security_token_has_sid(token, sd->owner_sid)) {
bits_remaining &= ~(SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL);
}
 
-   /* TODO: remove this, as it is file server specific */
-   if ((bits_remaining & SEC_RIGHTS_PRIV_RESTORE) &&
-   security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
-   bits_remaining &= ~(SEC_RIGHTS_PRIV_RESTORE);
-   }
-   if ((bits_remaining & SEC_RIGHTS_PRIV_BACKUP) &&
-   security_token_has_privilege(token, SEC_PRIV_BACKUP)) {
-   bits_remaining &= ~(SEC_RIGHTS_PRIV_BACKUP);
-   }
-
-   if ((bits_remaining & SEC_STD_WRITE_OWNER) &&
-security_token_has_privilege(token, SEC_PRIV_TAKE_OWNERSHIP)) {
-   bits_remaining &= ~(SEC_STD_WRITE_OWNER);
-   }
-
/* a NULL dacl allows access */
if ((sd->type & SEC_DESC_DACL_PRESENT) && sd->dacl == NULL) {
*access_granted = access_desired;
@@ -247,6 +221,34 @@ NTSTATUS se_access_check(const struct security_descriptor 
*sd,
 
bits_remaining |= explicitly_denied_bits;
 
+   /*
+* We check privileges here because they override even DENY entries.
+*/
+
+   /* Does the user have the privilege to gain SEC_PRIV_SECURITY? */
+   if (bits_remaining & SEC_FLAG_SYSTEM_SECURITY) {
+   if (security_token_has_privilege(token, SEC_PRIV_SECURITY)) {
+   bits_remaining &= ~SEC_FLAG_SYSTEM_SECURITY;
+   } else {
+   return NT_STATUS_PRIVILEGE_NOT_HELD;
+   }
+   }
+
+   /* TODO: remove this, as it is file server specific */
+   if ((bits_remaining & SEC_RIGHTS_PRIV_RESTORE) &&
+   security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
+   bits_remaining &= ~(SEC_RIGHTS_PRIV_RESTORE);
+   }
+   if ((bits_remaining & SEC_RIGHTS_PRIV_BACKUP) &&
+   security_token_has_privilege(token, SEC_PRIV_BACKUP)) {
+   bits_remaining &= ~(SEC_RIGHTS_PRIV_BACKUP);
+   }
+
+   if ((bits_remaining & SEC_STD_WRITE_OWNER) &&
+security_token_has_privilege(token, SEC_PRIV_TAKE_OWNERSHIP)) {
+   bits_remaining &= ~(SEC_STD_WRITE_OWNER);
+   }
+
 done:
if (bits_remaining != 0) {
*access_granted = bits_remaining;


-- 
Samba Shared Repository

autobuild: intermittent test failure detected

2012-03-09 Thread autobuild 
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-03-10-0033/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-03-10-0033/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-03-10-0033/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-03-10-0033/samba4.stderr
   http://git.samba.org/autobuild.flakey/2012-03-10-0033/samba4.stdout
  
The top commit at the time of the failure was:

commit 177c61bd72af3f8bf4bad5221e1ff67084bde397
Author: Volker Lendecke 
Date:   Fri Mar 9 14:47:43 2012 +0100

s3: asprintf->talloc_asprintf

Autobuild-User: Volker Lendecke 
Autobuild-Date: Fri Mar  9 19:01:06 CET 2012 on sn-devel-104

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

2012-03-09 Thread Karolin Seeger 
The branch, v3-5-test has been updated
   via  38bfe91 WHATSNEW: Update 3.5.13 release notes.
  from  abb2dcd WHATSNEW: Start to add changes since 3.5.12.

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


- Log -
commit 38bfe91ea3bad2e516320f9a0fef5cce42835e83
Author: Karolin Seeger 
Date:   Fri Mar 9 21:18:11 2012 +0100

WHATSNEW: Update 3.5.13 release notes.

Karolin

---

Summary of changes:
 WHATSNEW.txt |   49 -
 1 files changed, 48 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 3cef783..d90d69c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -8,19 +8,50 @@ This is the latest stable release of Samba 3.5.
 
 Major enhancements in Samba 3.5.13 include:
 
-o  
+o  Fix a crash bug in cldap_socket_recv_dgram() (bug #8593).
+o  Fully observe password change settings (bug #8561).
+o  Fix NT ACL issue (bug #8673).
+o  Fix segfault in Winbind if we can't map the last user (bug #8678).
+
 
 Changes since 3.5.12:
 
 
 
+o   Michael Adam 
+* BUG 8327: Fix config reload to reload shares from registry.
+
+
 o   Jeremy Allison 
+* BUG 8139: Ignore SMBecho errors.
+* BUG 8521: Fix Winbind cache timeout expiry test.
 * BUG 8561: Fully observe password change settings.
 * BUG 8631: Fix POSIX ACE x permission mapping to and from a DACL.
+* BUG 8636: When returning an ACL without SECINFO_DACL requested, we still
+  set SEC_DESC_DACL_PRESENT in the type field.
+* BUG 8644: Make sure that vfs_acl_xattr and vfs_acl_tdb modules add
+  inheritable entries on a directory with no stored ACL.
+* BUG 8663: Fix deleting a symlink if the symlink target is outside of the
+* share.
+* BUG 8664: Fix renaming a symlink if the symlink target is outside of the
+  share.
+* BUG 8673: Fix NT ACL issue.
+* BUG 8679: Make sure that recvfile code path using splice() on Linux
+  does not leave data in the pipe on short write.
+* BUG 8687: Fix typo in 'net memberships' usage.
+
+
+o   Christian Ambach 
+* BUG 8658: Add timeouts to Winbind cache.
+
+
+o   Andrew Bartlett 
+* BUG 8727: Do not limit read replies to NBT packet sizes.
 
 
 o   Günther Deschner 
 * BUG 8176: Fix perl path.
+* BUG 8692: Fix malloc/talloc mismatch in ads_keytab_verify_ticket().
 
 
 o   Björn Jacke 
@@ -34,16 +65,32 @@ o   Jeff Layton 
 
 o   Volker Lendecke 
 * BUG 8639: Fix the vfs_commit module.
+* BUG 8686: Packet validation checks can be done before length validation
+  causing uninitialized memory read.
 
 
 o   Stefan Metzmacher 
+* BUG 563: Fix 'smbclient tar' for files greater than 8GB on BE machines.
+
+
+o   Matthieu Patou 
+* BUG 8599: Make WINBINDD_PAM_AUTH_CRAP return valid user session key.
+* BUG 8771: Make Winbind change faster from DC1 to DC2.
 
 
 o   Andreas Schneider 
 * BUG 8608: Don't fail on users without a uid (Winbind).
+* BUG 8628: Don't duplicate Kerberos service tickets.
 * BUG 8645: Add missing prefixpath options for mount.cifs manpage.
+* BUG 8658: Add an update function for Winbind cache.
+* BUG 8678: Fix segfault in Winbind if we can't map the last user.
 
 
 o   Karolin Seeger 


-- 
Samba Shared Repository

autobuild: intermittent test failure detected

2012-03-09 Thread autobuild 
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-03-09-2028/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-03-09-2028/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-03-09-2028/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-03-09-2028/samba4.stderr
   http://git.samba.org/autobuild.flakey/2012-03-09-2028/samba4.stdout
  
The top commit at the time of the failure was:

commit 177c61bd72af3f8bf4bad5221e1ff67084bde397
Author: Volker Lendecke 
Date:   Fri Mar 9 14:47:43 2012 +0100

s3: asprintf->talloc_asprintf

Autobuild-User: Volker Lendecke 
Autobuild-Date: Fri Mar  9 19:01:06 CET 2012 on sn-devel-104

[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Volker Lendecke 
The branch, master has been updated
   via  177c61b s3: asprintf->talloc_asprintf
   via  8a75d3d s3: Replace a SMB_ASSERT with an error return
   via  1bf126c s3: Remove some superfluous ()
  from  9a93f43 s4 dns: Add support for PTR queries.

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


- Log -
commit 177c61bd72af3f8bf4bad5221e1ff67084bde397
Author: Volker Lendecke 
Date:   Fri Mar 9 14:47:43 2012 +0100

s3: asprintf->talloc_asprintf

Autobuild-User: Volker Lendecke 
Autobuild-Date: Fri Mar  9 19:01:06 CET 2012 on sn-devel-104

commit 8a75d3d91e90cc0cf617f06c63660d354684a60b
Author: Volker Lendecke 
Date:   Fri Mar 9 14:45:21 2012 +0100

s3: Replace a SMB_ASSERT with an error return

commit 1bf126c0b3bc3b6d73571bba4105f46bd1ad68ce
Author: Volker Lendecke 
Date:   Fri Mar 9 16:24:56 2012 +0100

s3: Remove some superfluous ()

---

Summary of changes:
 source3/rpc_client/cli_lsarpc.c |2 +-
 source3/smbd/notify.c   |   16 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 66192bd..59ca3b0 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -299,7 +299,7 @@ static NTSTATUS dcerpc_lsa_lookup_sids_noalloc(struct 
dcerpc_binding_handle *h,
domains[i] = talloc_strdup(domains,
   dom_name ? dom_name : "");
(types)[i] = lsa_names.names[i].sid_type;
-   if (((domains)[i] == NULL)) {
+   if ((domains)[i] == NULL) {
DEBUG(0, ("cli_lsa_lookup_sids_noalloc(): out 
of memory\n"));
*presult = NT_STATUS_UNSUCCESSFUL;
return status;
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 8160d5a..37d585b 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -181,7 +181,11 @@ NTSTATUS change_notify_create(struct files_struct *fsp, 
uint32 filter,
struct notify_entry e;
NTSTATUS status;
 
-   SMB_ASSERT(fsp->notify == NULL);
+   if (fsp->notify != NULL) {
+   DEBUG(1, ("change_notify_create: fsp->notify != NULL, "
+ "fname = %s\n", fsp->fsp_name->base_name));
+   return NT_STATUS_INVALID_PARAMETER;
+   }
 
if (!(fsp->notify = talloc_zero(NULL, struct notify_change_buf))) {
DEBUG(0, ("talloc failed\n"));
@@ -189,9 +193,11 @@ NTSTATUS change_notify_create(struct files_struct *fsp, 
uint32 filter,
}
 
/* Do notify operations on the base_name. */
-   if (asprintf(&fullpath, "%s/%s", fsp->conn->connectpath,
-fsp->fsp_name->base_name) == -1) {
-   DEBUG(0, ("asprintf failed\n"));
+   fullpath = talloc_asprintf(
+   talloc_tos(), "%s/%s", fsp->conn->connectpath,
+   fsp->fsp_name->base_name);
+   if (fullpath == NULL) {
+   DEBUG(0, ("talloc_asprintf failed\n"));
TALLOC_FREE(fsp->notify);
return NT_STATUS_NO_MEMORY;
}
@@ -207,7 +213,7 @@ NTSTATUS change_notify_create(struct files_struct *fsp, 
uint32 filter,
}
 
status = notify_add(fsp->conn->notify_ctx, &e, notify_callback, fsp);
-   SAFE_FREE(fullpath);
+   TALLOC_FREE(fullpath);
 
return status;
 }


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Kai Blin 
The branch, master has been updated
   via  9a93f43 s4 dns: Add support for PTR queries.
  from  1930781 s4-librpc: Remove unused new_ev

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


- Log -
commit 9a93f43cebcb6b677548919f57badc1a857cb13b
Author: Kai Blin 
Date:   Fri Mar 9 10:43:27 2012 +0100

s4 dns: Add support for PTR queries.

Autobuild-User: Kai Blin 
Autobuild-Date: Fri Mar  9 12:27:38 CET 2012 on sn-devel-104

---

Summary of changes:
 source4/dns_server/dns_query.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c
index 5320e21..42aa11f 100644
--- a/source4/dns_server/dns_query.c
+++ b/source4/dns_server/dns_query.c
@@ -66,6 +66,9 @@ static WERROR create_response_rr(const struct 
dns_name_question *question,
ans[ai].rdata.soa_record.expire  = rec->data.soa.expire;
ans[ai].rdata.soa_record.minimum = rec->data.soa.minimum;
break;
+   case DNS_QTYPE_PTR:
+   ans[ai].rdata.ptr_record = talloc_strdup(ans, rec->data.ptr);
+   break;
default:
return DNS_ERR(NOT_IMPLEMENTED);
}
@@ -109,7 +112,8 @@ static WERROR handle_question(struct dns_server *dns,
(recs[ri].wType != question->question_type)) {
continue;
}
-   create_response_rr(question, &recs[ri], &ans, &ai);
+   werror = create_response_rr(question, &recs[ri], &ans, &ai);
+   W_ERROR_NOT_OK_RETURN(werror);
}
 
if (ai == 0) {


-- 
Samba Shared Repository

autobuild: intermittent test failure detected

2012-03-09 Thread autobuild 
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-03-09-1034/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-03-09-1034/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-03-09-1034/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-03-09-1034/samba4.stderr
   http://git.samba.org/autobuild.flakey/2012-03-09-1034/samba4.stdout
  
The top commit at the time of the failure was:

commit 193078117d09732fa9c812303f505e59cc047c2b
Author: Andrew Bartlett 
Date:   Fri Mar 9 15:30:00 2012 +1100

s4-librpc: Remove unused new_ev

Autobuild-User: Andrew Bartlett 
Autobuild-Date: Fri Mar  9 07:18:45 CET 2012 on sn-devel-104