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

2011-04-21 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  67636bb Cosmetic. Fix bad indentation.
   via  5adbcb5 Fix compiler warning in debug message. (cherry picked from 
commit 644046f064d73ff97f95a7dfbc5fca199f0dd973)
   via  42b2f84 Remove duplicate code - move to parent_dirname() as a 
common function. (cherry picked from commit 
20baa11f33c5282c609258e21a07c7255df7ae30)
  from  0277063 s3-vfs: rename open function to open_fn.

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


- Log -
commit 67636bb27c75fb291a8adf36c6da0903fea3a8e9
Author: Jeremy Allison 
Date:   Thu Apr 21 17:25:13 2011 -0700

Cosmetic. Fix bad indentation.

Autobuild-User: Jeremy Allison 
Autobuild-Date: Fri Apr 22 03:16:43 CEST 2011 on sn-devel-104
(cherry picked from commit e919e767fb846fc91160cf44cbc838a9b4f2a832)

commit 5adbcb5b293effd7cf26fd38f1cde821671b2085
Author: Jeremy Allison 
Date:   Thu Apr 21 17:22:44 2011 -0700

Fix compiler warning in debug message.
(cherry picked from commit 644046f064d73ff97f95a7dfbc5fca199f0dd973)

commit 42b2f84837f3978b0c24f3374dd876e7d7d84de7
Author: Jeremy Allison 
Date:   Thu Apr 21 16:50:49 2011 -0700

Remove duplicate code - move to parent_dirname() as a common function.
(cherry picked from commit 20baa11f33c5282c609258e21a07c7255df7ae30)

---

Summary of changes:
 source3/printing/print_cups.c |4 +-
 source3/smbd/vfs.c|   75 +---
 2 files changed, 34 insertions(+), 45 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index e3b08b7..da42cb6 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -127,7 +127,7 @@ static bool send_pcap_blob(DATA_BLOB *pcap_blob, int fd)
return false;
}
 
-   DEBUG(10, ("successfully sent blob of len %ld\n", (int64_t)ret));
+   DEBUG(10, ("successfully sent blob of len %d\n", (int)ret));
return true;
 }
 
@@ -152,7 +152,7 @@ static bool recv_pcap_blob(TALLOC_CTX *mem_ctx, int fd, 
DATA_BLOB *pcap_blob)
return false;
}
 
-   DEBUG(10, ("successfully recvd blob of len %ld\n", (int64_t)ret));
+   DEBUG(10, ("successfully recvd blob of len %d\n", (int)ret));
return true;
 }
 
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 414e00c..3b482e7 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -899,7 +899,6 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn)
 NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
 {
char *resolved_name = NULL;
-   char *p = NULL;
 
DEBUG(3,("check_reduced_name [%s] [%s]\n", fname, conn->connectpath));
 
@@ -915,28 +914,20 @@ NTSTATUS check_reduced_name(connection_struct *conn, 
const char *fname)
case ENOENT:
{
TALLOC_CTX *ctx = talloc_tos();
-   char *tmp_fname = NULL;
-   char *last_component = NULL;
-   /* Last component didn't exist. Remove it and 
try and canonicalise the directory. */
-
-   tmp_fname = talloc_strdup(ctx, fname);
-   if (!tmp_fname) {
+   char *dir_name = NULL;
+   const char *last_component = NULL;
+   char *new_name = NULL;
+
+   /* Last component didn't exist.
+  Remove it and try and canonicalise
+  the directory name. */
+   if (!parent_dirname(ctx, fname,
+   &dir_name,
+   &last_component)) {
return NT_STATUS_NO_MEMORY;
}
-   p = strrchr_m(tmp_fname, '/');
-   if (p) {
-   *p++ = '\0';
-   last_component = p;
-   } else {
-   last_component = tmp_fname;
-   tmp_fname = talloc_strdup(ctx,
-   ".");
-   if (!tmp_fname) {
-   return NT_STATUS_NO_MEMORY;
-   }
-   }
 
-   resolved_name = 
SMB_VFS_REALPATH(conn,tmp_fname);
+   resolved_name = SMB_VFS_REALPATH(conn,dir_name);

[SCM] Samba Shared Repository - branch master updated

2011-04-21 Thread Jeremy Allison 
The branch, master has been updated
   via  e919e76 Cosmetic. Fix bad indentation.
   via  644046f Fix compiler warning in debug message.
   via  20baa11 Remove duplicate code - move to parent_dirname() as a 
common function.
  from  5290927 s3-vfs: another attempt to fix the Tru64 build.

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


- Log -
commit e919e767fb846fc91160cf44cbc838a9b4f2a832
Author: Jeremy Allison 
Date:   Thu Apr 21 17:25:13 2011 -0700

Cosmetic. Fix bad indentation.

Autobuild-User: Jeremy Allison 
Autobuild-Date: Fri Apr 22 03:16:43 CEST 2011 on sn-devel-104

commit 644046f064d73ff97f95a7dfbc5fca199f0dd973
Author: Jeremy Allison 
Date:   Thu Apr 21 17:22:44 2011 -0700

Fix compiler warning in debug message.

commit 20baa11f33c5282c609258e21a07c7255df7ae30
Author: Jeremy Allison 
Date:   Thu Apr 21 16:50:49 2011 -0700

Remove duplicate code - move to parent_dirname() as a common function.

---

Summary of changes:
 source3/printing/print_cups.c |4 +-
 source3/smbd/vfs.c|   75 +---
 2 files changed, 34 insertions(+), 45 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index e3b08b7..da42cb6 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -127,7 +127,7 @@ static bool send_pcap_blob(DATA_BLOB *pcap_blob, int fd)
return false;
}
 
-   DEBUG(10, ("successfully sent blob of len %ld\n", (int64_t)ret));
+   DEBUG(10, ("successfully sent blob of len %d\n", (int)ret));
return true;
 }
 
@@ -152,7 +152,7 @@ static bool recv_pcap_blob(TALLOC_CTX *mem_ctx, int fd, 
DATA_BLOB *pcap_blob)
return false;
}
 
-   DEBUG(10, ("successfully recvd blob of len %ld\n", (int64_t)ret));
+   DEBUG(10, ("successfully recvd blob of len %d\n", (int)ret));
return true;
 }
 
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 414e00c..3b482e7 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -899,7 +899,6 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn)
 NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
 {
char *resolved_name = NULL;
-   char *p = NULL;
 
DEBUG(3,("check_reduced_name [%s] [%s]\n", fname, conn->connectpath));
 
@@ -915,28 +914,20 @@ NTSTATUS check_reduced_name(connection_struct *conn, 
const char *fname)
case ENOENT:
{
TALLOC_CTX *ctx = talloc_tos();
-   char *tmp_fname = NULL;
-   char *last_component = NULL;
-   /* Last component didn't exist. Remove it and 
try and canonicalise the directory. */
-
-   tmp_fname = talloc_strdup(ctx, fname);
-   if (!tmp_fname) {
+   char *dir_name = NULL;
+   const char *last_component = NULL;
+   char *new_name = NULL;
+
+   /* Last component didn't exist.
+  Remove it and try and canonicalise
+  the directory name. */
+   if (!parent_dirname(ctx, fname,
+   &dir_name,
+   &last_component)) {
return NT_STATUS_NO_MEMORY;
}
-   p = strrchr_m(tmp_fname, '/');
-   if (p) {
-   *p++ = '\0';
-   last_component = p;
-   } else {
-   last_component = tmp_fname;
-   tmp_fname = talloc_strdup(ctx,
-   ".");
-   if (!tmp_fname) {
-   return NT_STATUS_NO_MEMORY;
-   }
-   }
 
-   resolved_name = 
SMB_VFS_REALPATH(conn,tmp_fname);
+   resolved_name = SMB_VFS_REALPATH(conn,dir_name);
if (!resolved_name) {
NTSTATUS status = 
map_nt_error_from_unix(errno);
 
@@ -951,18 +942,16 @@ NTSTATUS check_reduced_name(connection_struct *conn, 
const char *fname)
nt_errstr(status)));
return status;

[SCM] Samba Shared Repository - branch master updated

2011-04-21 Thread Günther Deschner 
The branch, master has been updated
   via  5290927 s3-vfs: another attempt to fix the Tru64 build.
   via  0e00351 s3-waf: try to fix the build on sunos5.
   via  a505806 s3-waf: fix typo in comment.
   via  3a72586 Revert "s3-vfs: try to fix the Tru64 build."
  from  1b7cd33 s3-vfs: try to fix the Tru64 build.

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


- Log -
commit 52909271879d909533a86c3a448839debb6497c6
Author: Günther Deschner 
Date:   Fri Apr 22 00:50:35 2011 +0200

s3-vfs: another attempt to fix the Tru64 build.

vfsops struct on Tru64 has a vfs_init function pointer.

Guenther

Autobuild-User: Günther Deschner 
Autobuild-Date: Fri Apr 22 01:49:59 CEST 2011 on sn-devel-104

commit 0e003515703469e9f66f5119d401366697cdb767
Author: Günther Deschner 
Date:   Fri Apr 22 00:49:54 2011 +0200

s3-waf: try to fix the build on sunos5.

Guenther

commit a505806aa088470c74ad3fbffac223d5400481fc
Author: Günther Deschner 
Date:   Fri Apr 22 00:49:28 2011 +0200

s3-waf: fix typo in comment.

Guenther

commit 3a725862cc5c2c32167871bdec0e7dc2ebe39a87
Author: Günther Deschner 
Date:   Fri Apr 22 00:15:47 2011 +0200

Revert "s3-vfs: try to fix the Tru64 build."

This reverts commit 1b7cd33291ec69f58a68396cf7406a6da3083df3.

---

Summary of changes:
 source3/configure.in  |2 ++
 source3/include/vfs.h |   10 --
 source3/wscript   |6 +-
 3 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index b2c1856..97e69a3 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5400,6 +5400,8 @@ if test x"$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" = 
x"yes"; then
 fi
 AC_MSG_RESULT([$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT])
 
+AC_CHECK_TYPE(struct vfsops,[AC_DEFINE(HAVE_STRUCT_VFSOPS,1,[Whether struct 
vfsops exists])],,[#include ])
+
 
 #
 # check for cluster extensions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index b96ab92..c86fad8 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -32,12 +32,6 @@
 #undef vfs_ops
 #endif
 
-/* Avoid conflict with an Tru64 include file:
-   the vfsops struct on Tru64 has a vfs_init function pointer which we
-   overwrite with a macro below */
-
-#undef vfsops
-
 /*
  * As we're now (thanks Andrew ! :-) using file_structs and connection
  * structs in the vfs - then anyone writing a vfs must include includes.h...
@@ -144,7 +138,11 @@
 
 
 /* to bug old modules which are trying to compile with the old functions */
+
+#ifndef HAVE_STRUCT_VFSOPS /* vfsops struct on Tru64 has a vfs_init function 
pointer */
 #define vfs_init 
__ERROR_please_port_this_module_to_SMB_VFS_INTERFACE_VERSION_8_donot_use_vfs_init_anymore(void)
 { 
__ERROR_please_port_this_module_to_SMB_VFS_INTERFACE_VERSION_8_donot_use_vfs_init_anymore
 };
+#endif /* HAVE_STRUCT_VFSOPS */
+
 #define lp_parm_string 
__ERROR_please_port_lp_parm_string_to_lp_parm_const_string_or_lp_parm_talloc_string
 { \
   
__ERROR_please_port_lp_parm_string_to_lp_parm_const_string_or_lp_parm_talloc_string
 };
 #define lp_vfs_options 
__ERROR_please_donot_use_lp_vfs_options_anymore_use_lp_parm__functions_instead
 { \
diff --git a/source3/wscript b/source3/wscript
index 673fdf3..672fcbb 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -191,7 +191,7 @@ main() {
 'HAVE_KERNEL_OPLOCKS_IRIX', headers='fcntl.h',
 msg="Checking for IRIX kernel oplock types")
 
-# Check for krenel share modes
+# Check for kernel share modes
 conf.CHECK_CODE('''
 #include 
 #include 
@@ -334,6 +334,8 @@ utimensat vsyslog _write __write __xstat
 conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
 elif (host_os.rfind('openbsd') > -1):
 conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+elif (host_os.rfind('sunos') > -1):
+conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
 # FIXME: Add more checks here.
 else:
 Logs.warn("Unknown host_os '%s', please report this to 
samba-techni...@samba.org" % host_os)
@@ -1632,6 +1634,8 @@ main() {
headers='sys/types.h dirent.h',
msg='Checking whether seekdir returns void')
 
+conf.CHECK_TYPE_IN('struct vfsops', 'sys/mount.h')
+
 if Options.options.with_profiling_data:
 conf.DEFINE('WITH_PROFILE', 1);
 


-- 
Samba Shared Repository

Re: [SCM] Samba Shared Repository - branch master updated

2011-04-21 Thread Jeremy Allison 
On Thu, Apr 21, 2011 at 07:14:02PM +0200, Günther Deschner wrote:
> The branch, master has been updated
>via  1b7cd33 s3-vfs: try to fix the Tru64 build.
>via  bb65187 s3-proto: move more rpc client prototypes to cli_pipe.h.
>   from  2b608f3 script: add hardcoded library release key id
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -
> commit 1b7cd33291ec69f58a68396cf7406a6da3083df3
> Author: Günther Deschner 
> Date:   Thu Apr 21 18:26:40 2011 +0200
> 
> s3-vfs: try to fix the Tru64 build.
> 
> Volker, Jeremy please check.
> 

Shouldn't this be bracketed with an :

#ifdef vfsops
+change
#endif

[SCM] Samba Shared Repository - branch master updated

2011-04-21 Thread Günther Deschner 
The branch, master has been updated
   via  1b7cd33 s3-vfs: try to fix the Tru64 build.
   via  bb65187 s3-proto: move more rpc client prototypes to cli_pipe.h.
  from  2b608f3 script: add hardcoded library release key id

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


- Log -
commit 1b7cd33291ec69f58a68396cf7406a6da3083df3
Author: Günther Deschner 
Date:   Thu Apr 21 18:26:40 2011 +0200

s3-vfs: try to fix the Tru64 build.

Volker, Jeremy please check.

Guenther

Autobuild-User: Günther Deschner 
Autobuild-Date: Thu Apr 21 19:14:00 CEST 2011 on sn-devel-104

commit bb65187b8978c418bff9cca0881b31b5ad9bb93e
Author: Günther Deschner 
Date:   Thu Apr 21 18:24:35 2011 +0200

s3-proto: move more rpc client prototypes to cli_pipe.h.

Guenther

---

Summary of changes:
 source3/include/proto.h   |7 ---
 source3/include/vfs.h |6 ++
 source3/rpc_client/cli_pipe.h |9 +
 3 files changed, 15 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d4ab13d..36f0235 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2672,13 +2672,6 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
 struct messaging_context *msg_ctx,
 struct rpc_pipe_client **cli_pipe);
 
-/* The following definitions come from rpc_client/cli_pipe_schannel.c  */
-
-NTSTATUS get_schannel_session_key(struct cli_state *cli,
- const char *domain,
- uint32 *pneg_flags,
- struct rpc_pipe_client **presult);
-
 /* The following definitions come from rpc_server/rpc_handles.c  */
 
 size_t num_pipe_handles(struct pipes_struct *p);
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 28d6c38..b96ab92 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -32,6 +32,12 @@
 #undef vfs_ops
 #endif
 
+/* Avoid conflict with an Tru64 include file:
+   the vfsops struct on Tru64 has a vfs_init function pointer which we
+   overwrite with a macro below */
+
+#undef vfsops
+
 /*
  * As we're now (thanks Andrew ! :-) using file_structs and connection
  * structs in the vfs - then anyone writing a vfs must include includes.h...
diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h
index 81c382f..65cc975 100644
--- a/source3/rpc_client/cli_pipe.h
+++ b/source3/rpc_client/cli_pipe.h
@@ -25,6 +25,8 @@
 
 #include "rpc_client/rpc_client.h"
 
+/* The following definitions come from rpc_client/cli_pipe.c  */
+
 struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
 struct event_context *ev,
 struct rpc_pipe_client *cli,
@@ -148,6 +150,13 @@ NTSTATUS cli_get_session_key(TALLOC_CTX *mem_ctx,
 struct rpc_pipe_client *cli,
 DATA_BLOB *session_key);
 
+/* The following definitions come from rpc_client/cli_pipe_schannel.c  */
+
+NTSTATUS get_schannel_session_key(struct cli_state *cli,
+ const char *domain,
+ uint32 *pneg_flags,
+ struct rpc_pipe_client **presult);
+
 #endif /* _CLI_PIPE_H */
 
 /* vim: set ts=8 sw=8 noet cindent ft=c.doxygen: */


-- 
Samba Shared Repository

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

2011-04-21 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  0277063 s3-vfs: rename open function to open_fn.
  from  c65b54c s3-build: move MAP_FILE define to the only place used.

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


- Log -
commit 02770631597d489851e52521a3f438533d18055e
Author: Günther Deschner 
Date:   Wed Apr 20 22:55:25 2011 +0200

s3-vfs: rename open function to open_fn.

This should finally fix the AIX build and allow to remove AIX specific 
ifdefs.

Guenther

Signed-off-by: Jeremy Allison 

Autobuild-User: Jeremy Allison 
Autobuild-Date: Thu Apr 21 02:01:20 CEST 2011 on sn-devel-104
(cherry picked from commit c7073f8b545976719bfdba7b7bbd460d595041d5)

---

Summary of changes:
 examples/VFS/skel_opaque.c |2 +-
 examples/VFS/skel_transparent.c|2 +-
 source3/include/vfs.h  |7 ---
 source3/modules/vfs_acl_tdb.c  |2 +-
 source3/modules/vfs_acl_xattr.c|2 +-
 source3/modules/vfs_audit.c|2 +-
 source3/modules/vfs_cap.c  |2 +-
 source3/modules/vfs_catia.c|2 +-
 source3/modules/vfs_commit.c   |2 +-
 source3/modules/vfs_default.c  |6 +-
 source3/modules/vfs_extd_audit.c   |2 +-
 source3/modules/vfs_full_audit.c   |2 +-
 source3/modules/vfs_onefs.c|2 +-
 source3/modules/vfs_onefs_shadow_copy.c|2 +-
 source3/modules/vfs_prealloc.c |2 +-
 source3/modules/vfs_preopen.c  |2 +-
 source3/modules/vfs_scannedonly.c  |2 +-
 source3/modules/vfs_shadow_copy2.c |2 +-
 source3/modules/vfs_smb_traffic_analyzer.c |2 +-
 source3/modules/vfs_streams_depot.c|2 +-
 source3/modules/vfs_streams_xattr.c|2 +-
 source3/modules/vfs_syncops.c  |2 +-
 source3/modules/vfs_time_audit.c   |2 +-
 source3/smbd/vfs.c |7 ++-
 24 files changed, 28 insertions(+), 34 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index ef7c3af..f60f0fe 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -801,7 +801,7 @@ struct vfs_fn_pointers skel_transparent_fns = {
 
/* File operations */
 
-   .open = skel_open,
+   .open_fn = skel_open,
.create_file = skel_create_file,
.close_fn = skel_close_fn,
.vfs_read = skel_vfs_read,
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 403e28d..f06e02a 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -745,7 +745,7 @@ struct vfs_fn_pointers skel_transparent_fns = {
 
/* File operations */
 
-   .open = skel_open,
+   .open_fn = skel_open,
.create_file = skel_create_file,
.close_fn = skel_close_fn,
.vfs_read = skel_vfs_read,
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index ad15bd8..28d6c38 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -133,6 +133,7 @@
 /* Leave at 28 - not yet released. Rename posix_fallocate to fallocate
to split out the two possible uses. JRA. */
 /* Leave at 28 - not yet released. Add fdopendir. JRA. */
+/* Leave at 28 - not yet released. Rename open function to open_fn. - gd */
 #define SMB_VFS_INTERFACE_VERSION 28
 
 
@@ -214,9 +215,9 @@ struct vfs_fn_pointers {
 
/* File operations */
 
-   int (*open)(struct vfs_handle_struct *handle,
-   struct smb_filename *smb_fname, files_struct *fsp,
-   int flags, mode_t mode);
+   int (*open_fn)(struct vfs_handle_struct *handle,
+  struct smb_filename *smb_fname, files_struct *fsp,
+  int flags, mode_t mode);
NTSTATUS (*create_file)(struct vfs_handle_struct *handle,
struct smb_request *req,
uint16_t root_dir_fid,
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 17cf493..f2e0415 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -402,7 +402,7 @@ static struct vfs_fn_pointers vfs_acl_tdb_fns = {
.opendir = opendir_acl_common,
.mkdir = mkdir_acl_common,
.rmdir = rmdir_acl_tdb,
-   .open = open_acl_common,
+   .open_fn = open_acl_common,
.create_file = create_file_acl_common,
.unlink = unlink_acl_tdb,
.chmod = chmod_acl_module_common,
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 90959f3..2a83430 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -206,

[SCM] Samba Shared Repository - branch master updated

2011-04-21 Thread Stefan Metzmacher 
The branch, master has been updated
   via  2b608f3 script: add hardcoded library release key id
  from  ab9d9cf s4:ldb: change version to 1.1.0 after adding new functions:

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


- Log -
commit 2b608f3e677295ca66cdae73c1461847155ca01c
Author: Stefan Metzmacher 
Date:   Thu Apr 21 17:37:06 2011 +0200

script: add hardcoded library release key id

We don't want to use the key that might be configured
in ~/.gitconfig.

metze

Autobuild-User: Stefan Metzmacher 
Autobuild-Date: Thu Apr 21 18:25:32 CEST 2011 on sn-devel-104

---

Summary of changes:
 script/librelease.sh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/librelease.sh b/script/librelease.sh
index b2bc9e7..666c392 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -39,7 +39,7 @@ release_lib() {
 
 tagname=$(basename $tarname .tar | sed s/[\.]/-/g)
 echo "tagging as $tagname"
-git tag -s "$tagname" -m "$lib: tag release $tagname"
+git tag -u 13084025 -s "$tagname" -m "$lib: tag release $tagname"
 
 echo "signing"
 rm -f "$tarname.asc"


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag ldb-1-1-0 created

2011-04-21 Thread Stefan Metzmacher 
The annotated tag, ldb-1-1-0 has been created
at  f2d537a07c24f112d406752b3d574e9e63c52557 (tag)
   tagging  ab9d9cfd33f12929dc05f8e02c3d671844e078fa (commit)
  replaces  tevent-0-9-11
 tagged by  Stefan Metzmacher
on  Thu Apr 21 17:33:38 2011 +0200

- Log -
ldb: tag release ldb-1-1-0
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAABAgAGBQJNsE5SAAoJEEeTkWETCEAlMoUIAMD4KWDG5EWYJ4XtNOadZ5+Y
h62be6p08Y217+4Rx5TsWQxhBVyEMycmyQckekIFjY7i3FHomeRNBWXIsmwYj26D
3rEICM5GtdEcNLetnXcYYzKrfUWIniAuf/Rcws4yCEeUSGIrj/zVUdbCr7dmQ3xr
AgGI2QVeeUWrqcq431fmPHNvvVswKq7/E9TdfSuJiltWDA7AUu6RwhwftMC/WmNL
dw5F64deBHjaz+g5BtZbJH3DLFWF7+GKj9wUEvjbD2zZS7Ab81q2lrhlNiv8TR+6
I3/Jwh6GilinEvfR9a/pk7wpxDZ46AQ67nrfhzPETCX/XhX+IixYSpWcukbG+mE=
=znV0
-END PGP SIGNATURE-

Andreas Schneider (34):
  s3-rpc_server: Rename system_user to ncalrpc_as_system.
  s3-epmapper: Use DCERPC_AUTH_LEVEL_CONNECT for ep ncalrpc.
  s3-epmapper: Added a cleanup function.
  s3-epmapper: Shutdown the embedded epmapper cleanly.
  s3-epmd: Cleanup endpoint mapper correctly.
  s3-librpc: Leave the epm registration connection open.
  s3-rpc_server: Added a memory context to the ep regsiter state.
  s3-rpc_server: Implement an endpoint monitor loop.
  s3-rpc_server: Rename req to subreq.
  s3-rpc_server: Added disconnect callback function.
  s3-epmapper: Added function to delete endpoint entries.
  s3-epmd: Cleanup endpoints on service pipe disconnect.
  s3-epmapper: Remove unregister on shutdown.
  s3-epmapper: Setup epm in smbd to forward np requests.
  s3-epmapper: Log error if we can't register the endpoint.
  s3-epmapper: Increase debug levels.
  s3-epmapper: Use strcmp instead of strequal and check IPv6.
  s3-epmapper: Refactor the cleanup of endpoints.
  librpc: Added a dcerpc_binding_dup() function.
  s3-epmapper: Make sure we work on a description duplicate.
  librpc: Return an error if we a broken floor.
  s3-spoolssd: Fixed reopening of logs.
  s3-spoolssd: Pass down event and messanging context.
  s3-spoolssd: Added missing include.
  s3-spoolssd: Fixed logfile creation.
  s3-epmap: Make rpc_ep_setup_register an internal function.
  s3-spoolssd: Register spoolssd endpoints.
  s3-spoolssd: Start the spoolss service correctly.
  s3-rpc_server: Only allow embedded, daemon and external server type.
  s3-rpc_server: Fixed rpc_pipe_open_internal documentation.
  s3-winbindd: Use the correct enums for samr_QueryDomainInfo.
  s3-smbd: Added a change_to_user_by_session() function.
  s3-smbd: Added a become_user_by_session() function.
  s3-printing: Use become_user_by_session() function.

Andrew Bartlett (122):
  s3-lib Remove the clobber_region() code.
  s3-safe_str: Futher simplify the macros by removing indirection
  s3-safe_string: Add checked_strlcpy()
  s3-lib prepare Samba3 to use common codepoint based string functions
  lib/util: Merge basic string length and comparison functions
  s3-charcnv Add convert_string_error()
  lib/util/charset rename iconv_convenience to iconv_handle
  wintest New snapshot for my wintest VMs
  s3-selftest unconditionaly include subunit.sh
  s3-selftest Add tests for security=server
  s3-selftest Allow LM passwords and turn of NTLMv2 for security=share test
  s3-selftest Fix test_smbclient_auth.sh
  lib/util/charset Remove pointless static bool initialised
  s3:lib make lazy_initialize_conv() static
  lib/util Move base64 functions into lib/util/base64.c
  lib/util/charset Add tests for convert_string_talloc_handle()
  lib/util/charset correct calculation of UTF8 character sizes
  lib/util/charset Add wrapper to allow testing of strlen_m_ext()
  lib/util/charset Add tests for strlen_m_ext() and convert_string_talloc()
  lib/util/charset smb_panic() on incorrect use of strlen_m_ext
  lib/util/charset Add tests for strcasecmp_m(), talloc_strupper() et al
  s3-selftest Disable log rotation in 'make test'
  s4-credentials Add a command line hook to set the kerberos credentials 
cache
  s3-selftest Add testing of kerberos login
  s3-selftest Remove more instances of /tmp in test_smbclient_s3.sh
  s3-auth consolidate create_local_token() into make_server_info_krb5()
  s3-rpc_server Remove comment, yes the key is correct.
  s3-auth use create_local_token() to transform server_info -> session_info
  s3-auth Rename user_session_key -> session_key to match auth_session_info
  s3-selftest Look only under source3 for smb.conf files
  librpc/idl Add [nopython] to krb5pac ndrdump functions
  pidl: Add support for the [ignore] property
  s4-auth: Always talloc_zero() the struct auth_session_info
  auth: Move auth_session_info into IDL
  kdc: always ldb escape the re

[SCM] Samba Shared Repository - branch master updated

2011-04-21 Thread Stefan Metzmacher 
The branch, master has been updated
   via  ab9d9cf s4:ldb: change version to 1.1.0 after adding new functions:
   via  93d5e7a ldb: add custom flags and functions for the application 
that wants to manipulate them
   via  f04689a s4:ldb/tests: add tests for ldbmodify and 'modrdn'
   via  e57a23d s4:ldb/tools: add support for "modrdn" to ldbmodify
   via  a3b9522 s4:ldb/ldif: add support for "modrdn"
  from  c7073f8 s3-vfs: rename open function to open_fn.

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


- Log -
commit ab9d9cfd33f12929dc05f8e02c3d671844e078fa
Author: Stefan Metzmacher 
Date:   Sat Apr 9 11:33:03 2011 +0200

s4:ldb: change version to 1.1.0 after adding new functions:

ldb_ldif_parse_modrdn()
ldb_req_set_custom_flags()
ldb_req_get_custom_flags()

Signed-off-by: Simo Sorce 

metze

Autobuild-User: Stefan Metzmacher 
Autobuild-Date: Thu Apr 21 17:15:16 CEST 2011 on sn-devel-104

commit 93d5e7a018cc4d999c2f322902fa337c6af724d1
Author: Matthieu Patou 
Date:   Wed Apr 20 20:26:47 2011 +0400

ldb: add custom flags and functions for the application that wants to 
manipulate them

Signed-off-by: Simo Sorce 
Signed-off-by: Stefan Metzmacher 

commit f04689ae63a9dfdca6d5eb8679186561d3e450b4
Author: Stefan Metzmacher 
Date:   Wed Apr 6 20:14:54 2011 +0200

s4:ldb/tests: add tests for ldbmodify and 'modrdn'

Signed-off-by: Simo Sorce 

metze

commit e57a23d23f8af229168935681bf3394108df29cd
Author: Stefan Metzmacher 
Date:   Tue Apr 5 14:42:06 2011 +0200

s4:ldb/tools: add support for "modrdn" to ldbmodify

Signed-off-by: Simo Sorce 

metze

commit a3b952288987e2b62693bdece8c6bd0246f57262
Author: Stefan Metzmacher 
Date:   Tue Apr 5 14:41:27 2011 +0200

s4:ldb/ldif: add support for "modrdn"

This add a ldb_ldif_parse_modrdn() helper function to parse
the information out of a ldb_message structure.

Signed-off-by: Simo Sorce 

metze

---

Summary of changes:
 .../lib/ldb/ABI/{ldb-1.0.2.sigs => ldb-1.1.0.sigs} |3 +
 source4/lib/ldb/common/ldb.c   |   38 
 source4/lib/ldb/common/ldb_ldif.c  |  199 
 source4/lib/ldb/include/ldb.h  |   28 +++-
 source4/lib/ldb/include/ldb_module.h   |   14 ++
 source4/lib/ldb/include/ldb_private.h  |2 +
 source4/lib/ldb/tests/test-generic.sh  |5 +-
 source4/lib/ldb/tests/test-modify-modrdn.ldif  |   12 ++
 source4/lib/ldb/tools/ldbmodify.c  |   24 +++-
 source4/lib/ldb/wscript|2 +-
 10 files changed, 323 insertions(+), 4 deletions(-)
 copy source4/lib/ldb/ABI/{ldb-1.0.2.sigs => ldb-1.1.0.sigs} (98%)
 create mode 100644 source4/lib/ldb/tests/test-modify-modrdn.ldif


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/ABI/ldb-1.0.2.sigs 
b/source4/lib/ldb/ABI/ldb-1.1.0.sigs
similarity index 98%
copy from source4/lib/ldb/ABI/ldb-1.0.2.sigs
copy to source4/lib/ldb/ABI/ldb-1.1.0.sigs
index c13ac87..149d4bc 100644
--- a/source4/lib/ldb/ABI/ldb-1.0.2.sigs
+++ b/source4/lib/ldb/ABI/ldb-1.1.0.sigs
@@ -97,6 +97,7 @@ ldb_handler_copy: int (struct ldb_context *, void *, const 
struct ldb_val *, str
 ldb_handler_fold: int (struct ldb_context *, void *, const struct ldb_val *, 
struct ldb_val *)
 ldb_init: struct ldb_context *(TALLOC_CTX *, struct tevent_context *)
 ldb_ldif_message_string: char *(struct ldb_context *, TALLOC_CTX *, enum 
ldb_changetype, const struct ldb_message *)
+ldb_ldif_parse_modrdn: int (struct ldb_context *, const struct ldb_ldif *, 
TALLOC_CTX *, struct ldb_dn **, struct ldb_dn **, bool *, struct ldb_dn **, 
struct ldb_dn **)
 ldb_ldif_read: struct ldb_ldif *(struct ldb_context *, int (*)(void *), void *)
 ldb_ldif_read_file: struct ldb_ldif *(struct ldb_context *, FILE *)
 ldb_ldif_read_free: void (struct ldb_context *, struct ldb_ldif *)
@@ -193,10 +194,12 @@ ldb_register_module: int (const struct ldb_module_ops *)
 ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
 ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
 ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
+ldb_req_get_custom_flags: uint32_t (struct ldb_request *)
 ldb_req_is_untrusted: bool (struct ldb_request *)
 ldb_req_location: const char *(struct ldb_request *)
 ldb_req_mark_trusted: void (struct ldb_request *)
 ldb_req_mark_untrusted: void (struct ldb_request *)
+ldb_req_set_custom_flags: void (struct ldb_request *, uint32_t)
 ldb_req_set_location: void (struct ldb_request *, const char *)
 ldb_request: int (struct ldb_context *, struct ldb_request *)
 ldb_request_add_control: int (struct ldb_request *, const char *, bool, void *)
diff

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

2011-04-21 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  c65b54c s3-build: move MAP_FILE define to the only place used.
   via  bb88fda s4-smbtorture: restructure documentname handling in spoolss 
test a bit.
  from  3d14ed9 s3-spoolss: fix debug statement in 
spoolss_addprinterex_level_2().

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


- Log -
commit c65b54c8ee1b9c1982eb81a1d7fa43ae46c0a378
Author: Günther Deschner 
Date:   Wed Apr 20 18:21:25 2011 +0200

s3-build: move MAP_FILE define to the only place used.

Guenther

Autobuild-User: Günther Deschner 
Autobuild-Date: Wed Apr 20 19:16:47 CEST 2011 on sn-devel-104
(cherry picked from commit 0b89ce671250daddc86400ef4e1996c37c126025)

commit bb88fdade421b0226805d32c448fa1be9eb7faa5
Author: Günther Deschner 
Date:   Wed Apr 20 17:53:43 2011 +0200

s4-smbtorture: restructure documentname handling in spoolss test a bit.

Guenther
(cherry picked from commit c8f9515f193e634da2ef01c525e2a05a3d519862)

---

Summary of changes:
 source3/include/includes.h |4 
 source3/modules/vfs_aio_fork.c |4 
 source4/torture/rpc/spoolss.c  |7 ---
 3 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 536dc45..54459a5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -580,10 +580,6 @@ enum flush_reason_enum {
 #define SIGRTMIN NSIG
 #endif
 
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
 #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
 #define OSF1_ENH_SEC 1
 #endif
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 881bc51..41b5a89 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -24,6 +24,10 @@
 #include "system/shmem.h"
 #include "smbd/smbd.h"
 
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+
 struct mmap_area {
size_t size;
volatile void *ptr;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6ba1c3d..3809136 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3256,6 +3256,7 @@ static bool test_EnumJobs_args(struct torture_context 
*tctx,
 static bool test_DoPrintTest_add_one_job(struct torture_context *tctx,
 struct dcerpc_binding_handle *b,
 struct policy_handle *handle,
+const char *document_name,
 uint32_t *job_id)
 {
NTSTATUS status;
@@ -3274,7 +3275,7 @@ static bool test_DoPrintTest_add_one_job(struct 
torture_context *tctx,
s.in.level  = 1;
s.in.info.info1 = &info1;
s.out.job_id= job_id;
-   info1.document_name = "TorturePrintJob";
+   info1.document_name = document_name;
info1.output_file   = NULL;
info1.datatype  = "RAW";
 
@@ -3417,7 +3418,7 @@ static bool test_DoPrintTest(struct torture_context *tctx,
job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
 
for (i=0; i < num_jobs; i++) {
-   ret &= test_DoPrintTest_add_one_job(tctx, b, handle, 
&job_ids[i]);
+   ret &= test_DoPrintTest_add_one_job(tctx, b, handle, 
"TorturePrintJob", &job_ids[i]);
}
 
for (i=0; i < num_jobs; i++) {
@@ -3444,7 +3445,7 @@ static bool test_DoPrintTest_extended(struct 
torture_context *tctx,
job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
 
for (i=0; i < num_jobs; i++) {
-   ret &= test_DoPrintTest_add_one_job(tctx, b, handle, 
&job_ids[i]);
+   ret &= test_DoPrintTest_add_one_job(tctx, b, handle, 
"TorturePrintJob", &job_ids[i]);
}
 
ret &= test_DoPrintTest_check_jobs(tctx, b, handle, num_jobs, job_ids);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-stable updated

2011-04-21 Thread Karolin Seeger 
The branch, v3-4-stable has been updated
   via  d4ae73b WHATSNEW: Start release notes for Samba 3.4.14.
   via  ffb29b1 VERSION: Bump version number up to 3.4.14.
  from  e1a17c8 WHATSNEW: Update changes since 3.4.12.

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


- Log -
commit d4ae73b58acc3e32031f23747e9a6990fc2d414e
Author: Karolin Seeger 
Date:   Thu Apr 21 10:08:19 2011 +0200

WHATSNEW: Start release notes for Samba 3.4.14.

Karolin
(cherry picked from commit 2c9a3dbdb18f8773754d2cc417c61f5dfd452008)

commit ffb29b14aa8818b365a358cc36cdb3a6e24dfb14
Author: Karolin Seeger 
Date:   Thu Apr 21 10:06:36 2011 +0200

VERSION: Bump version number up to 3.4.14.

Karolin
(cherry picked from commit 2c72a084ec5eb8d368e34962b39278eb3b2176c6)

---

Summary of changes:
 WHATSNEW.txt|   45 +++--
 source3/VERSION |2 +-
 2 files changed, 44 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d8900c4..b14e254 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,45 @@
==
+   Release Notes for Samba 3.4.14
+ , 2011
+   ==
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.14 include:
+
+o 
+
+Changes since 3.4.13
+
+
+
+o  
+
+##
+Reporting bugs & Development Discussion
+###
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+==
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+==
+
+
+Release notes for older versions follow:
+
+
+   ==
Release Notes for Samba 3.4.13
  April 21, 2011
==
@@ -48,8 +89,8 @@ database (https://bugzilla.samba.org/).
 ==
 
 
-Release notes for older versions follow:
-
+--
+
 
==
Release Notes for Samba 3.4.12
diff --git a/source3/VERSION b/source3/VERSION
index dab9b4a..5770e04 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
 
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=13
+SAMBA_VERSION_RELEASE=14
 
 
 # Bug fix releases use a letter for the patch revision #


-- 
Samba Shared Repository

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

2011-04-21 Thread Karolin Seeger 
The branch, v3-4-test has been updated
   via  2c9a3db WHATSNEW: Start release notes for Samba 3.4.14.
   via  2c72a08 VERSION: Bump version number up to 3.4.14.
  from  b5e5510 WHATSNEW: Update changes since 3.4.12.

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


- Log -
commit 2c9a3dbdb18f8773754d2cc417c61f5dfd452008
Author: Karolin Seeger 
Date:   Thu Apr 21 10:08:19 2011 +0200

WHATSNEW: Start release notes for Samba 3.4.14.

Karolin

commit 2c72a084ec5eb8d368e34962b39278eb3b2176c6
Author: Karolin Seeger 
Date:   Thu Apr 21 10:06:36 2011 +0200

VERSION: Bump version number up to 3.4.14.

Karolin

---

Summary of changes:
 WHATSNEW.txt|   45 +++--
 source3/VERSION |2 +-
 2 files changed, 44 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d8900c4..b14e254 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,45 @@
==
+   Release Notes for Samba 3.4.14
+ , 2011
+   ==
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.14 include:
+
+o 
+
+Changes since 3.4.13
+
+
+
+o  
+
+##
+Reporting bugs & Development Discussion
+###
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+==
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+==
+
+
+Release notes for older versions follow:
+
+
+   ==
Release Notes for Samba 3.4.13
  April 21, 2011
==
@@ -48,8 +89,8 @@ database (https://bugzilla.samba.org/).
 ==
 
 
-Release notes for older versions follow:
-
+--
+
 
==
Release Notes for Samba 3.4.12
diff --git a/source3/VERSION b/source3/VERSION
index 78aeb38..e812712 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
 
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=13
+SAMBA_VERSION_RELEASE=14
 
 
 # Bug fix releases use a letter for the patch revision #


-- 
Samba Shared Repository

[SCM] Samba Website Repository - branch master updated

2011-04-21 Thread Karolin Seeger 
The branch, master has been updated
   via  5e448ca Announce Samba 3.4.13.
  from  e72fad3 Fix date.

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


- Log -
commit 5e448cafbaf5eb594f0933896cb225fb4da8daec
Author: Karolin Seeger 
Date:   Wed Apr 20 21:45:32 2011 +0200

Announce Samba 3.4.13.

Karolin

---

Summary of changes:
 generated_news/latest_10_bodies.html|   25 
 generated_news/latest_10_headlines.html |6 +--
 generated_news/latest_2_bodies.html |   21 --
 history/samba-3.4.13.html   |   47 +++
 4 files changed, 73 insertions(+), 26 deletions(-)
 create mode 100755 history/samba-3.4.13.html


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html 
b/generated_news/latest_10_bodies.html
index e3c547d..8e3cdbc 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -1,3 +1,15 @@
+   21 April 2011
+   Samba 3.4.13 Available for Download
+
+Samba 3.4.13 is available for download. This is the latest stable release
+of the 3.4 series.
+
+The uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+http://www.samba.org/samba/ftp/stable/samba-3.4.13.tar.gz";>downloaded 
now.
+See http://www.samba.org/samba/history/samba-3.4.13.html";>the release 
notes for more
+info.
+
12 April 2011
Samba 3.6.0pre2 Available for Download
Samba 3.6.0pre2 is available for download.  This is a
@@ -121,16 +133,3 @@ release notes for more info.
 using Jelmer Vernooij's GnuPG keys (ID 1EEF5276 and D729A457).  The source 
code can be
 http://samba.org/samba/ftp/samba4/samba-4.0.0alpha13.tar.gz";>downloaded
 now.  See the http://lists.samba.org/archive/samba-technical/2010-September/073481.html";>announcement
 on the mailing list for more information.
-
- 
-   14 September 2010
-   Samba 3.5.5 Security Release Available
-   This is a security release to address http://www.samba.org/samba/security/CVE-2010-3069";>CVE-2010-3069 
(Buffer Overrun Vulnerability).
-
-Patches for all current releases are available on our http://www.samba.org/samba/security/";>security page.
-
-The uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-http://www.samba.org/samba/ftp/stable/samba-3.5.5.tar.gz";>downloaded 
now.
-See http://www.samba.org/samba/history/samba-3.5.5.html";>the release 
notes for more
-info.
diff --git a/generated_news/latest_10_headlines.html 
b/generated_news/latest_10_headlines.html
index 1e0b0e5..4fba2e3 100644
--- a/generated_news/latest_10_headlines.html
+++ b/generated_news/latest_10_headlines.html
@@ -1,4 +1,6 @@
 
+21 April 2011 Samba 3.4.13 Available for 
Download
+
 12 April 2011 Samba 3.6.0pre2 Available for 
Download
 
 7 March 2011 Samba 3.5.8 Available for 
Download
@@ -16,8 +18,4 @@
 8 October 2010 Samba 3.5.6 Available for 
Download
 
21 September 2010 Samba 4.0.0alpha13 
available
-
-   14 September 2010 Samba 3.5.5 Security Release 
Available
-
-   14 September 2010 Samba 3.4.9 Security Release 
Available
 
diff --git a/generated_news/latest_2_bodies.html 
b/generated_news/latest_2_bodies.html
index e9c9302..38ac9a3 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -1,3 +1,15 @@
+   21 April 2011
+   Samba 3.4.13 Available for Download
+
+Samba 3.4.13 is available for download. This is the latest stable release
+of the 3.4 series.
+
+The uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+http://www.samba.org/samba/ftp/stable/samba-3.4.13.tar.gz";>downloaded 
now.
+See http://www.samba.org/samba/history/samba-3.4.13.html";>the release 
notes for more
+info.
+
12 April 2011
Samba 3.6.0pre2 Available for Download
Samba 3.6.0pre2 is available for download.  This is a
@@ -16,12 +28,3 @@
  Precompiled packages will
  be made available on a volunteer basis and can be found in the
  http://samba.org/samba/ftp/Binary_Packages/";>Binary_Packages 
download area.
-
-   7 March 2011
-   Samba 3.5.8 Available for Download
-   This is the latest stable release of the Samba 3.5 series.
-
-The uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-http://samba.org/samba/ftp/stable/samba-3.5.8.tar.gz";>downloaded
-now. A http://samba.org/samba/ftp/patches/patch-3.5.7-3.5.8.diffs.gz";>patch 
against Samba 3.5.7 is also available. See http://samba.org/samba/history/samba-3.5.8.html";>the release notes for 
more info.
diff --git a/history/samba-3.4.13.html b/history/samba-3.4.13.html
new file mode 100755
index 000..

[SCM] Samba Shared Repository - annotated tag release-3-4-13 created

2011-04-21 Thread Karolin Seeger 
The annotated tag, release-3-4-13 has been created
at  01aba93477be21a6143a86fca2f0f76974e5b467 (tag)
   tagging  e1a17c8cbc0a619d0f0a34e65559bb6a2081dd97 (commit)
  replaces  release-3-4-12
 tagged by  Karolin Seeger
on  Wed Apr 20 20:54:30 2011 +0200

- Log -
tag release-3-4-13
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.15 (GNU/Linux)

iD8DBQBNrywTbzORW2Vot+oRAp/WAJ98IdvLilSHP8asSfqblzeazlQwngCeMspL
jvat+AlprnMBDe4LGlUKxXA=
=QWYe
-END PGP SIGNATURE-

Günther Deschner (1):
  s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().

Karolin Seeger (4):
  VERSION: Bump version number up to 3.4.13.
  WHATSNEW: Start 3.4.13 release notes.
  WHATSNEW: Prepare 3.4.13 release notes.
  WHATSNEW: Update changes since 3.4.12.

Sergey Korsak (1):
  s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD

Volker Lendecke (1):
  Allow NULL queue to writev_send

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-stable updated

2011-04-21 Thread Karolin Seeger 
The branch, v3-4-stable has been updated
   via  e1a17c8 WHATSNEW: Update changes since 3.4.12.
   via  4a7df93 s3: Fix bug 8099 - setpwent() actually does endpwent() on 
FreeBSD (cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686) 
(cherry picked from commit fd387cd0bf186a94b64e8c2085c943992629e5af)
   via  17ba461 WHATSNEW: Prepare 3.4.13 release notes.
   via  69da1d2 s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().
   via  4bcf42d Allow NULL queue to writev_send
  from  c32b64f WHATSNEW: Start 3.4.13 release notes.

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


- Log -
commit e1a17c8cbc0a619d0f0a34e65559bb6a2081dd97
Author: Karolin Seeger 
Date:   Wed Apr 20 20:51:26 2011 +0200

WHATSNEW: Update changes since 3.4.12.

Karolin
(cherry picked from commit b5e5510ea62af1df31b5f06c5cf1029217b648e1)

commit 4a7df93a2a1dd0ffd368529da9ed11129dc3af91
Author: Sergey Korsak 
Date:   Tue Apr 19 18:51:32 2011 +0200

s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD
(cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686)
(cherry picked from commit fd387cd0bf186a94b64e8c2085c943992629e5af)

commit 17ba461da17272cf5b1c7dcba9c393069d9974db
Author: Karolin Seeger 
Date:   Mon Apr 18 15:00:14 2011 +0200

WHATSNEW: Prepare 3.4.13 release notes.

Karolin
(cherry picked from commit 0517118cbfe7455ba288d6c59cb5ed7f22274b35)

commit 69da1d2d5e80ba5a8f1ef4e76890b5d3e7176a07
Author: Günther Deschner 
Date:   Wed Apr 13 17:41:36 2011 +0200

s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().

Make sure we use a timeout of 60 seconds, not 60 milliseconds...

This prevented us from successfully using the ncacn_ip_tcp client in a lot 
of
places, I guess.

Guenther

Autobuild-User: Volker Lendecke 
Autobuild-Date: Wed Apr 13 18:59:19 CEST 2011 on sn-devel-104
(cherry picked from commit 4b3fe5247a6e16b1ad9f05269e9aa00e3120e36a)

Fix bug #8085 - incorrect timeout handling in ncacn_ip_tcp client code.
(cherry picked from commit d7d39c723e1855a3d18813e8a79fcca9770b0142)
(cherry picked from commit f7a175f47ee65c58363615541577db65d8b9fa76)

commit 4bcf42d4048d739b5309e3f3d4331dd66632e049
Author: Volker Lendecke 
Date:   Sun May 10 10:49:18 2009 +0200

Allow NULL queue to writev_send

Fix bug #8086 - null pointer reference crashes winbind.
(cherry picked from commit 7a801a842c7c6636c654489cb53bb8271c6927c8)

---

Summary of changes:
 WHATSNEW.txt   |   17 ++---
 lib/async_req/async_sock.c |   22 --
 nsswitch/winbind_nss_freebsd.c |8 
 source3/rpc_client/cli_pipe.c  |2 +-
 4 files changed, 35 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1ae912a..d8900c4 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,20 +1,31 @@
==
Release Notes for Samba 3.4.13
-, 2011
+ April 21, 2011
==
 
 
 This is the latest stable release of Samba 3.4.
 
+Major enhancements in Samba 3.4.13 include:
 
-o  
+o  Fix Winbind crash caused by null pointer reference (bug #8086).
+o  Fix incorrect timeout handling in ncacn_ip_tcp client code (bug #8085).
 
 
 Changes since 3.4.12
 
 
 
-o   Jeremy Allison 
+o   Günther Deschner 
+* BUG 8085: Fix incorrect timeout handling in ncacn_ip_tcp client code.
+
+
+o   Volker Lendecke 
+* BUG 8086: Fix Winbind crash caused by null pointer reference.
+
+
+o   Sergey Korsak 
+* BUG 8099: setpwent() actually does endpwent() on FreeBSD.
 
 
 ##
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 39705f4..c428e3c 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -387,11 +387,11 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, 
struct tevent_context *ev,
   struct tevent_queue *queue, int fd,
   struct iovec *iov, int count)
 {
-   struct tevent_req *result;
+   struct tevent_req *req;
struct writev_state *state;
 
-   result = tevent_req_create(mem_ctx, &state, struct writev_state);
-   if (result == NULL) {
+   req = tevent_req_create(mem_ctx, &state, struct writev_state);
+   if (req == NULL) {
return NULL;
}
state->ev = ev;
@@ -404,12 +404,22 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, 
struct tevent_context *ev,
goto fail;
}
 
-   if (!tevent_queue_add(queue, ev, result, writev_trigger,