[SCM] Samba Shared Repository - branch master updated

2012-08-13 Thread Andrew Bartlett
The branch, master has been updated
   via  9db35c9 VERSION: Move on to beta6!
   via  b5281eb VERSION: Mark as the beta6 release
   via  03a20ae WHATSNEW: prepare for 4.0 beta6
  from  fe29535 s3-vfs: Put vfs_aixacl_util.c helper functions into a 
header file

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


- Log -
commit 9db35c939c57f152f1e42cfcb9ae16cf3fada3f1
Author: Andrew Bartlett 
Date:   Tue Aug 14 09:32:00 2012 +1000

VERSION: Move on to beta6!

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Tue Aug 14 04:05:06 CEST 2012 on sn-devel-104

commit b5281eb473426f5f8674652cb7e3fb83ffdecab8
Author: Andrew Bartlett 
Date:   Tue Aug 14 09:31:26 2012 +1000

VERSION: Mark as the beta6 release

commit 03a20ae9ee03089a939372d7a8a475a79ceb4f86
Author: Andrew Bartlett 
Date:   Tue Aug 14 09:30:30 2012 +1000

WHATSNEW: prepare for 4.0 beta6

---

Summary of changes:
 VERSION  |2 +-
 WHATSNEW.txt |   47 ---
 2 files changed, 17 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 1012cd9..781a283 100644
--- a/VERSION
+++ b/VERSION
@@ -67,7 +67,7 @@ SAMBA_VERSION_ALPHA_RELEASE=
 # e.g. SAMBA_VERSION_BETA_RELEASE=1#
 #  ->  "4.0.0beta1"#
 
-SAMBA_VERSION_BETA_RELEASE=6
+SAMBA_VERSION_BETA_RELEASE=7
 
 
 # For 'pre' releases the version will be   #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1b08ff3..a4b5d8c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4.0 beta5
+What's new in Samba 4.0 beta6
 =
 
 Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,7 +11,7 @@ and above.
 WARNINGS
 
 
-Samba 4.0 beta5 is not a final Samba release, however we are now making
+Samba 4.0 beta6 is not a final Samba release, however we are now making
 good progress towards a Samba 4.0 release, of which this is a preview.
 Be aware the this release contains the best of all of Samba's
 technology parts, both a file server (that you can reasonably expect
@@ -94,46 +94,29 @@ Python programs to interface to Samba's internals, and many 
tools and
 internal workings of the DC code is now implemented in python.
 
 
-CHANGES SINCE beta4
+CHANGES SINCE beta5
 =
 
-For a list of changes since beta4, please see the git log.
+For a list of changes since beta5, please see the git log.
 
 $ git clone git://git.samba.org/samba.git
 $ cd samba.git
-$ git log samba-4.0.0beta4..samba-4.0.0beta5
+$ git log samba-4.0.0beta5..samba-4.0.0beta6
 
 Some major user-visible changes include:
 
-- The issue with beta4 being unable to build with a released version of
-  ldb has been resolved. 
+- Provision is now faster, as we now correctly use the database
+  indicies during the provision
 
-- The two parameter tables for our two smb.conf parsing engines have
-  been merged.  This removes the ugly (but harmless) "unknown
-  parameter xxx" warnings, particularly from the smbd child process.
+- Support for handling of Extended Signatures (Session Key Protection)
 
-- Major issues have been fixed in conflict and missing/deleted parent
-  handling in or DRS replication engine.
+- A (unverified at this time) fix for expanding memory use in our
+  AD DRS replication server.
 
-- Safety improvements to prevent corruption of read-write replicas
-  by manual replication from a read-only replica.
+- A fix for supporting the userWorkstations restriction in the KDC
 
-- Improvements to dbcheck to correct incorrect instanceType values from
-  the above and to relocate objects with missing parents.
-
-- smbd no longer places all accounts in the 'Domain Users' of the AD
-  domain to which it is joined
-
-- AES support in NETLOGON Schannel
-
-- DCE/RPC timeout handling no longer crashes
-
-- "socket address" is now "nbt client socket address" as it only
-  controls the binding of the NetBIOS client, not other protocols.
-  See 'bind interfaces only = yes'.  This parameter is also now depricated.
-
-- nmbd now always binds to it's broadcast sockets explicitly, rather
-  than just relying on the socket address above.
+- Support for upgrading classic domains that may not have all the
+  default domain policies set.
 
 Less visible, but important changes under the hood include:
 
@@ -144,6 +127,8 @@ Less visible, but important changes under the hood include:
 - Patches to ensure that talloc_tos() and talloc_stackframe() are
   always used correctly.
 
+- Preparation for correctly setting POSIX ACLs during provision.
+
 KNOWN ISSUES
 
 
@@ -165,7 +150,7 @@ KNOWN ISSUES
   this par

[SCM] Samba Shared Repository - branch master updated

2012-08-13 Thread Andrew Bartlett
The branch, master has been updated
   via  fe29535 s3-vfs: Put vfs_aixacl_util.c helper functions into a 
header file
   via  f11a1a4 s4:kdc/wdc-samba4.c - fix user logins on specific 
workstations
   via  a57c5eb s4-classicupgrade: Tests if sam policies exist before 
trying to import them.
   via  34c4664 s3-selftest: Add smbclient tarmode test
   via  1428500 s3-selftest: Fix copy/paste error in test usage string
  from  4e4c306 Fix smbclient/tarmode panic on connecting to Windows 2000 
clients.

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


- Log -
commit fe295358dfa495c8f4b564784d728b37882e877d
Author: Andrew Bartlett 
Date:   Mon Aug 13 20:14:43 2012 +1000

s3-vfs: Put vfs_aixacl_util.c helper functions into a header file

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Tue Aug 14 02:16:11 CEST 2012 on sn-devel-104

commit f11a1a4a0796c8e77eee721f1ed1406b01e2b007
Author: Matthias Dieter Wallnöfer 
Date:   Mon Aug 13 20:17:20 2012 +0200

s4:kdc/wdc-samba4.c - fix user logins on specific workstations

The decrement operation has been missing.

Problem found by Mohammad Ebrahim Abravi 

Signed-off-by: Andrew Bartlett 

commit a57c5eb848698a4231f851744949c6a44e92784a
Author: Wesley Young 
Date:   Mon Aug 13 01:08:36 2012 +

s4-classicupgrade: Tests if sam policies exist before trying to import them.

Signed-off-by: Andrew Bartlett 

commit 34c4664dc0a52862ea6a36cc44d09593557a6396
Author: Salvador I. Gonzalez 
Date:   Sat Aug 11 10:48:36 2012 -0400

s3-selftest: Add smbclient tarmode test

(With small changes to have test complete by Andrew Bartlett)

Signed-off-by: Andrew Bartlett 

commit 14285005ec5f208327ab8236e9c33bfefe38126a
Author: Salvador I. Gonzalez 
Date:   Sat Aug 11 10:47:58 2012 -0400

s3-selftest: Fix copy/paste error in test usage string

Signed-off-by: Andrew Bartlett 

---

Summary of changes:
 source3/modules/vfs_aixacl.c   |4 +-
 source3/modules/vfs_aixacl_util.c  |1 +
 .../modules/vfs_aixacl_util.h  |   14 +-
 source3/script/tests/test_smbclient_auth.sh|2 +-
 source3/script/tests/test_smbclient_tarmode.sh |  181 
 source3/selftest/tests.py  |5 +-
 source4/kdc/wdc-samba4.c   |9 +-
 source4/scripting/python/samba/upgrade.py  |   55 ---
 8 files changed, 229 insertions(+), 42 deletions(-)
 copy source4/auth/ntlm/auth_server_service.c => 
source3/modules/vfs_aixacl_util.h (71%)
 create mode 100755 source3/script/tests/test_smbclient_tarmode.sh


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index c4bb02e..9f66d2a 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -20,9 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-
-extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
-extern struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T 
theacl);
+#include "vfs_aixacl_util.h"
 
 SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p,
diff --git a/source3/modules/vfs_aixacl_util.c 
b/source3/modules/vfs_aixacl_util.c
index d867f9d..b359c40 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "vfs_aixacl_util.h"
 
 SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 {
diff --git a/source4/auth/ntlm/auth_server_service.c 
b/source3/modules/vfs_aixacl_util.h
similarity index 71%
copy from source4/auth/ntlm/auth_server_service.c
copy to source3/modules/vfs_aixacl_util.h
index 65b9dc2..2447252 100644
--- a/source4/auth/ntlm/auth_server_service.c
+++ b/source3/modules/vfs_aixacl_util.h
@@ -1,7 +1,7 @@
 /*
-   Unix SMB/CIFS implementation.
-   Password and authentication handling
-   Copyright (C) Andrew Bartlett 2010
+   Unix SMB/Netbios implementation.
+   VFS module to get and set posix acls
+   Copyright (C) Jim McDonough  2006
 
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,10 +17,6 @@
along with this program.  If not, see .
 */
 
-#include "includes.h"
-#include "auth/auth.h"
+SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
+struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
 
-NTSTATUS server_service_auth_init(void)
-{
-   return auth4_init();
-}
diff --git a/source3/script/tests/test_smbclient_auth.sh 
b/source3/script/tests/test_smbclient_au

[SCM] Samba Shared Repository - branch master updated

2012-08-13 Thread Jeremy Allison
The branch, master has been updated
   via  4e4c306 Fix smbclient/tarmode panic on connecting to Windows 2000 
clients.
   via  aaeb3f5 Ensure we update last_access on the winbindd child struct 
on each request.
  from  f7403d8 s3: skip loading vfs modules for printer connections

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


- Log -
commit 4e4c3062bc4eac8ef6311e41e5632f7c17d5b1c3
Author: Salvador I. Gonzalez 
Date:   Sat Aug 11 13:46:41 2012 -0400

Fix smbclient/tarmode panic on connecting to Windows 2000 clients.

  'Freed frame ../source3/libsmb/clilist.c:934, expected 
../source3/client/clitar.c:821'
  Cause: (strequal(finfo->name,"..") || strequal(finfo->name,"."))
evaluates to true, do_tar returns without freeing ctx

Signed-off-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Mon Aug 13 23:12:50 CEST 2012 on sn-devel-104

commit aaeb3f5d9b488dd55e47a3cc329b4cb226f2f0e1
Author: Jeremy Allison 
Date:   Mon Aug 13 10:34:52 2012 -0700

Ensure we update last_access on the winbindd child struct on each request.

---

Summary of changes:
 source3/client/clitar.c |   27 +++
 source3/winbindd/winbindd.c |1 +
 2 files changed, 20 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index cae512b..d352571 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -821,8 +821,10 @@ static NTSTATUS do_tar(struct cli_state *cli_state, struct 
file_info *finfo,
TALLOC_CTX *ctx = talloc_stackframe();
NTSTATUS status = NT_STATUS_OK;
 
-   if (strequal(finfo->name,"..") || strequal(finfo->name,"."))
-   return NT_STATUS_OK;
+   if (strequal(finfo->name,"..") || strequal(finfo->name,".")) {
+   status = NT_STATUS_OK;
+   goto cleanup;
+   }
 
/* Is it on the exclude list ? */
if (!tar_excl && clipn) {
@@ -835,7 +837,8 @@ static NTSTATUS do_tar(struct cli_state *cli_state, struct 
file_info *finfo,
client_get_cur_dir(),
finfo->name);
if (!exclaim) {
-   return NT_STATUS_NO_MEMORY;
+   status = NT_STATUS_NO_MEMORY;
+   goto cleanup;
}
 
DEBUG(5, ("...tar_re_search: %d\n", tar_re_search));
@@ -844,7 +847,8 @@ static NTSTATUS do_tar(struct cli_state *cli_state, struct 
file_info *finfo,
(tar_re_search && mask_match_list(exclaim, 
cliplist, clipn, True))) {
DEBUG(3,("Skipping file %s\n", exclaim));
TALLOC_FREE(exclaim);
-   return NT_STATUS_OK;
+   status = NT_STATUS_OK;
+   goto cleanup;
}
TALLOC_FREE(exclaim);
}
@@ -856,7 +860,8 @@ static NTSTATUS do_tar(struct cli_state *cli_state, struct 
file_info *finfo,
 
saved_curdir = talloc_strdup(ctx, client_get_cur_dir());
if (!saved_curdir) {
-   return NT_STATUS_NO_MEMORY;
+   status = NT_STATUS_NO_MEMORY;
+   goto cleanup;
}
 
DEBUG(5, ("strlen(cur_dir)=%d, \
@@ -869,7 +874,8 @@ strlen(finfo->name)=%d\nname=%s,cur_dir=%s\n",
client_get_cur_dir(),
finfo->name);
if (!new_cd) {
-   return NT_STATUS_NO_MEMORY;
+   status = NT_STATUS_NO_MEMORY;
+   goto cleanup;
}
client_set_cur_dir(new_cd);
 
@@ -888,7 +894,8 @@ strlen(finfo->name)=%d\nname=%s,cur_dir=%s\n",
"%s*",
client_get_cur_dir());
if (!mtar_mask) {
-   return NT_STATUS_NO_MEMORY;
+   status = NT_STATUS_NO_MEMORY;
+   goto cleanup;
}
DEBUG(5, ("Doing list with mtar_mask: %s\n", mtar_mask));
do_list(mtar_mask, attribute, do_tar, False, True);
@@ -902,11 +909,15 @@ strlen(finfo->name)=%d\nname=%s,cur_dir=%s\n",
client_get_cur_dir(),
finfo->name);
if (!rname) {
-   return NT_STATUS_NO_MEMORY;
+   status = NT_STATUS_NO_MEMORY;
+   goto cleanup;
}
status = do_atar(rname,finfo->name,finfo);
TALLOC_FREE(rname);
}
+
+  cleanup:
+   TALLOC_FREE(ctx);
return st