Hello community,

here is the log from the commit of package samba for openSUSE:Factory checked 
in at 2012-05-07 22:51:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
 and      /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "samba", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes      2012-04-12 
09:51:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-05-07 
22:51:59.000000000 +0200
@@ -1,0 +2,22 @@
+Sat Apr 21 20:59:53 UTC 2012 - [email protected]
+
+- docs-xml: fix default name resolve order; (bso#7564).
+- s3-aio-fork: Fix a segfault in vfs_aio_fork; (bso#8836).
+- docs: remove whitespace in example samba.ldif; (bso#8789).
+- s3-smbd: move print_backend_init() behind init_system_info(); (bso#8845).
+- s3-docs: Prepend '/' to filename argument; (bso#8826).
+
+-------------------------------------------------------------------
+Fri Apr 20 09:51:25 UTC 2012 - [email protected]
+
+- Update to 3.6.5.
+- Restrict self granting privileges where security=ads for Samba post-3.3.16;
+  CVE-2012-2111; (bnc#757576).
+
+-------------------------------------------------------------------
+Fri Apr 13 18:18:52 CEST 2012 - [email protected]
+
+- Remove all precompiled idl output to ensure any pidl changes take effect;
+  (bnc#757080).
+
+-------------------------------------------------------------------
@@ -354,0 +377,6 @@
+
+-------------------------------------------------------------------
+Thu Nov 25 18:57:04 CET 2011 - [email protected]
+
+- Do not map POSIX execute permission to Windows FILE_READ_ATTRIBUTES;
+  (bso#8631); (bnc#732572).

Old:
----
  samba-3.6.4.tar.bz2

New:
----
  samba-3.6.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.uUgs1U/_old  2012-05-07 22:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.uUgs1U/_new  2012-05-07 22:52:02.000000000 +0200
@@ -82,7 +82,7 @@
 %else
 BuildRequires:  pkgconfig
 %endif
-%define        samba_ver 3.6.4
+%define        samba_ver 3.6.5
 %define        samba_ver_suffix %nil
 %define        samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -104,7 +104,7 @@
 %else
 %define        build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.4
+Version:        3.6.5
 Release:        1
 %define        ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
@@ -280,6 +280,8 @@
 #ln -s m4/aclocal.m4 aclocal.m4
 #autoreconf --force --install -I. -Im4 -I../lib/replace
 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 
0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
+# Ensure all idl is recompiled, in case we are carrying pidl changes locally.
+rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
@@ -449,7 +451,7 @@
 the man pages.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %changelog

++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.uUgs1U/_old  2012-05-07 22:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.uUgs1U/_new  2012-05-07 22:52:02.000000000 +0200
@@ -82,7 +82,7 @@
 %else
 BuildRequires:  pkgconfig
 %endif
-%define        samba_ver 3.6.4
+%define        samba_ver 3.6.5
 %define        samba_ver_suffix %nil
 %define        samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -104,7 +104,7 @@
 %else
 %define        build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.4
+Version:        3.6.5
 Release:        1
 %define        ldapsmb_ver 1.34b
 License:        GPL-3.0+
@@ -211,8 +211,8 @@
 how to.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package client
 License:        GPL-3.0+
@@ -252,8 +252,8 @@
 how to.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
 
@@ -272,8 +272,8 @@
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@@ -297,8 +297,8 @@
 the man pages.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 
@@ -319,8 +319,8 @@
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if %{make_utils}
 
@@ -335,8 +335,8 @@
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 
@@ -367,8 +367,8 @@
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -393,15 +393,15 @@
 
 %description -n libsmbclient
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 This package includes the libsmbclient library.
@@ -439,8 +439,8 @@
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libnetapi0
 License:        GPL-3.0+
@@ -452,8 +452,8 @@
 This package includes the netapi library.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libnetapi-devel
 License:        GPL-3.0+
@@ -471,8 +471,8 @@
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -492,15 +492,15 @@
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 This package includes the smbsharemodes library.
@@ -525,8 +525,8 @@
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libwbclient0
 License:        LGPL-3.0+
@@ -538,8 +538,8 @@
 This package includes the wbclient library.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libwbclient-devel
 License:        LGPL-3.0+
@@ -557,8 +557,8 @@
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtalloc2
 Version:        %{libtalloc_ver}
@@ -572,8 +572,8 @@
 This package includes the talloc library.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
@@ -593,8 +593,8 @@
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtdb1
 Version:        %{libtdb_ver}
@@ -608,8 +608,8 @@
 This package includes the tdb library.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
@@ -625,8 +625,8 @@
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtevent0
 Version:        %{libtevent_ver}
@@ -640,8 +640,8 @@
 This package includes the tevent library.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
@@ -662,8 +662,8 @@
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libldb1
 Version:        %{libldb_ver}
@@ -678,8 +678,8 @@
 This package includes the ldb library.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libldb-devel
 Version:        %{libldb_ver}
@@ -700,8 +700,8 @@
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if %{make_ldapsmb}
 
@@ -718,8 +718,8 @@
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2784
-Branch      : 3.6.4
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 
@@ -822,6 +822,8 @@
 #ln -s m4/aclocal.m4 aclocal.m4
 #autoreconf --force --install -I. -Im4 -I../lib/replace
 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 
0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
+# Ensure all idl is recompiled, in case we are carrying pidl changes locally.
+rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
@@ -875,6 +877,7 @@
 %endif
 ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL}
 ./script/mkversion.sh
+make samba3-idl
 make %{build_make_smp_mflags} \
        all bin/smbfilter
 %if %{make_ldapsmb}

++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.uUgs1U/_old  2012-05-07 22:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.uUgs1U/_new  2012-05-07 22:52:02.000000000 +0200
@@ -1,2 +1,2 @@
-2784
-Branch      : 3.6.4
+2798
+Branch      : 3.6.5.PTF

++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches/samba.org/3bdcf3208c8ff1a99bc457549257af83a869b381 
new/patches/samba.org/3bdcf3208c8ff1a99bc457549257af83a869b381
--- old/patches/samba.org/3bdcf3208c8ff1a99bc457549257af83a869b381      
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/3bdcf3208c8ff1a99bc457549257af83a869b381      
2012-04-30 18:02:24.000000000 +0200
@@ -0,0 +1,46 @@
+commit 3bdcf3208c8ff1a99bc457549257af83a869b381
+Author: Ralph Wuerthner <[email protected]>
+Date:   Wed Apr 4 17:40:27 2012 +0200
+
+    s3-smbd: move print_backend_init() behind init_system_info()
+    
+    On smbd startup check_published_printers() fails with the following error
+    messages:
+    
+    [2012/04/04 16:29:50.511526,  0] 
printing/nt_printing_ads.c:360(check_published_printers)
+      check_published_printers: Could not create system session_info
+    [2012/04/04 16:29:50.512101,  0] 
printing/nt_printing.c:102(nt_printing_init)
+      nt_printing_init: error checking published printers: WERR_ACCESS_DENIED
+    
+    check_published_printers() requires session_info to be set, but
+    initialization of session_info in main() is done after calling
+    print_backend_init(). Move print_backend_init() behind init_system_info().
+    
+    Signed-off-by: Ralph Wuerthner <[email protected]>
+    
+    Fix bug #8845 (check_published_printers: Could not create system 
session_info).
+
+Index: source3/smbd/server.c
+===================================================================
+--- source3/smbd/server.c.orig
++++ source3/smbd/server.c
+@@ -1209,9 +1209,6 @@ extern void build_options(bool screen);
+       if (!W_ERROR_IS_OK(registry_init_full()))
+               exit(1);
+ 
+-      if (!print_backend_init(smbd_messaging_context()))
+-              exit(1);
+-
+       /* Open the share_info.tdb here, so we don't have to open
+          after the fork on every single connection.  This is a small
+          performance improvment and reduces the total number of system
+@@ -1228,6 +1225,9 @@ extern void build_options(bool screen);
+               return -1;
+       }
+ 
++      if (!print_backend_init(smbd_messaging_context()))
++              exit(1);
++
+       if (!init_guest_info()) {
+               DEBUG(0,("ERROR: failed to setup guest info.\n"));
+               return -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches/samba.org/6edb03ed1678c4301c559e2f67c131450d3a8cfa 
new/patches/samba.org/6edb03ed1678c4301c559e2f67c131450d3a8cfa
--- old/patches/samba.org/6edb03ed1678c4301c559e2f67c131450d3a8cfa      
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/6edb03ed1678c4301c559e2f67c131450d3a8cfa      
2012-04-30 18:02:24.000000000 +0200
@@ -0,0 +1,19 @@
+commit 6edb03ed1678c4301c559e2f67c131450d3a8cfa
+Author: Björn Baumbach <[email protected]>
+Date:   Wed Apr 4 16:41:35 2012 +0200
+
+    docs: remove whitespace in example samba.ldif (fix bug #8789) (cherry 
picked from commit 9a68a98e87e5597ba684bea3d5e6a44951e51973)
+
+Index: examples/LDAP/samba.ldif
+===================================================================
+--- examples/LDAP/samba.ldif.orig
++++ examples/LDAP/samba.ldif
+@@ -153,7 +153,7 @@ olcAttributeTypes: {49}( 1.3.6.1.4.1.716
+  21.1.27 SINGLE-VALUE )
+ olcAttributeTypes: {50}( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC
+   'Fully qualified name of the domain with which a trust exists' EQUALITY case
+-  IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
++ IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
+ olcAttributeTypes: {51}( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'Ne
+  tBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.
+  121.1.15{128} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches/samba.org/ad6d51892597336aa162452f3944393fa5afa7c4 
new/patches/samba.org/ad6d51892597336aa162452f3944393fa5afa7c4
--- old/patches/samba.org/ad6d51892597336aa162452f3944393fa5afa7c4      
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/ad6d51892597336aa162452f3944393fa5afa7c4      
2012-04-30 18:02:24.000000000 +0200
@@ -0,0 +1,22 @@
+commit ad6d51892597336aa162452f3944393fa5afa7c4
+Author: Björn Baumbach <[email protected]>
+Date:   Wed Apr 4 16:58:24 2012 +0200
+
+    docs-xml: fix default name resolve order (fix bug #7564)
+    
+    Autobuild-User: Volker Lendecke <[email protected]>
+    Autobuild-Date: Fri Apr  6 09:54:37 CEST 2012 on sn-devel-104
+    (cherry picked from commit 189b3d9b24bf553ff7096397c389f20ba99e0dfa)
+
+Index: docs-xml/smbdotconf/protocol/nameresolveorder.xml
+===================================================================
+--- docs-xml/smbdotconf/protocol/nameresolveorder.xml.orig
++++ docs-xml/smbdotconf/protocol/nameresolveorder.xml
+@@ -65,6 +65,6 @@
+  
+ </description>
+ 
+-<value type="default">lmhosts host wins bcast</value>
++<value type="default">lmhosts wins host bcast</value>
+ <value type="example">lmhosts bcast host</value>
+ </samba:parameter>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches/samba.org/b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17 
new/patches/samba.org/b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17
--- old/patches/samba.org/b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17      
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17      
2012-04-30 18:02:24.000000000 +0200
@@ -0,0 +1,74 @@
+commit b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17
+Author: Volker Lendecke <[email protected]>
+Date:   Sat Mar 31 13:37:20 2012 +0200
+
+    s3-aio-fork: Fix a segfault in vfs_aio_fork
+    
+    aio_suspend does not signal the main process with a signal, it just waits. 
The
+    aio_fork module does not use the signal at all, it directly calls back 
into the
+    main smbd by calling smbd_aio_complete_aio_ex. This is an abstraction
+    violation, but the alternative would have been to use signals where they 
are
+    not needed. However, in wait_for_aio_completion this bites us: With 
aio_fork we
+    call handle_aio_completed twice on the same aio_ex struct: Once from the 
call
+    to handle_aio_completion within the aio_fork module and once from the code 
in
+    wait_for_aio_completion.
+    
+    This patch fixes it in a pretty bad way by introducing flag variables and 
more
+    state. But the mid-term plan is to replace the posix aio calls from the 
vfs and
+    do pread_send/recv and pwrite_send/recv at the vfs layer, so this will
+    significantly change anyway.
+    
+    Thanks to Kirill Malkin <[email protected]> for reporting 
this
+    crash!
+    
+    The last 2 patches address bug #8836 (aio_fork segfaults on "smbcontrol
+    close-share").
+
+Index: source3/modules/vfs_aio_fork.c
+===================================================================
+--- source3/modules/vfs_aio_fork.c.orig
++++ source3/modules/vfs_aio_fork.c
+@@ -101,6 +101,8 @@ struct aio_child {
+       bool dont_delete;       /* Marked as in use since last cleanup */
+       bool cancelled;
+       bool read_cmd;
++      bool called_from_suspend;
++      bool completion_done;
+ };
+ 
+ struct aio_child_list {
+@@ -432,6 +434,10 @@ static void handle_aio_completion(struct
+                      child->retval.size);
+       }
+ 
++      if (child->called_from_suspend) {
++              child->completion_done = true;
++              return;
++      }
+       aio_ex = (struct aio_extra 
*)child->aiocb->aio_sigevent.sigev_value.sival_ptr;
+       smbd_aio_complete_aio_ex(aio_ex);
+       TALLOC_FREE(aio_ex);
+@@ -850,7 +856,9 @@ static int aio_fork_suspend(struct vfs_h
+                                            handle_aio_completion,
+                                            child);
+ 
+-                      while (1) {
++                      child->called_from_suspend = true;
++
++                      while (!child->completion_done) {
+                               if (tevent_loop_once(ev) == -1) {
+                                       goto out;
+                               }
+@@ -859,12 +867,6 @@ static int aio_fork_suspend(struct vfs_h
+                                       errno = EAGAIN;
+                                       goto out;
+                               }
+-
+-                              /* We set child->aiocb to NULL in our hooked
+-                               * AIO_RETURN(). */
+-                              if (child->aiocb == NULL) {
+-                                      break;
+-                              }
+                       }
+               }
+       }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches/samba.org/e538c0b1f99853e2921c48db28ef32d33f4fd50d 
new/patches/samba.org/e538c0b1f99853e2921c48db28ef32d33f4fd50d
--- old/patches/samba.org/e538c0b1f99853e2921c48db28ef32d33f4fd50d      
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/e538c0b1f99853e2921c48db28ef32d33f4fd50d      
2012-04-30 18:02:24.000000000 +0200
@@ -0,0 +1,20 @@
+commit e538c0b1f99853e2921c48db28ef32d33f4fd50d
+Author: SATOH Fumiyasu <[email protected]>
+Date:   Mon Mar 26 19:13:12 2012 +0900
+
+    s3-docs: Prepend '/' to filename argument (Bug #8826)
+    (cherry picked from commit 6804e46811dd13cfd405f7c48a3dc2bc6501d75c)
+
+Index: docs-xml/manpages-3/smbcacls.1.xml
+===================================================================
+--- docs-xml/manpages-3/smbcacls.1.xml.orig
++++ docs-xml/manpages-3/smbcacls.1.xml
+@@ -20,7 +20,7 @@
+       <cmdsynopsis>
+               <command>smbcacls</command>
+               <arg choice="req">//server/share</arg>
+-              <arg choice="req">filename</arg>
++              <arg choice="req">/filename</arg>
+               <arg choice="opt">-D|--delete acls</arg>
+               <arg choice="opt">-M|--modify acls</arg>
+               <arg choice="opt">-a|--add acls</arg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches/samba.org/ee81564123be5e21b87e7003b51467180c3fdcb5 
new/patches/samba.org/ee81564123be5e21b87e7003b51467180c3fdcb5
--- old/patches/samba.org/ee81564123be5e21b87e7003b51467180c3fdcb5      
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/ee81564123be5e21b87e7003b51467180c3fdcb5      
2012-04-30 18:02:24.000000000 +0200
@@ -0,0 +1,45 @@
+commit ee81564123be5e21b87e7003b51467180c3fdcb5
+Author: Volker Lendecke <[email protected]>
+Date:   Sat Mar 31 13:34:42 2012 +0200
+
+    s3-aio-fork: Fix aio_suspend event hierarchy
+    
+    We end up here multiple times. There's no real point putting the events 
into
+    the child struct, at the end of this routine we need to free them anyway.
+
+Index: source3/modules/vfs_aio_fork.c
+===================================================================
+--- source3/modules/vfs_aio_fork.c.orig
++++ source3/modules/vfs_aio_fork.c
+@@ -827,6 +827,8 @@ static int aio_fork_suspend(struct vfs_h
+                */
+ 
+               for (child = children->children; child != NULL; child = 
child->next) {
++                      struct tevent_fd *event;
++
+                       if (child->aiocb == NULL) {
+                               continue;
+                       }
+@@ -841,16 +843,12 @@ static int aio_fork_suspend(struct vfs_h
+                               continue;
+                       }
+ 
+-                      /* We're never using this event on the
+-                       * main event context again... */
+-                      TALLOC_FREE(child->sock_event);
+-
+-                      child->sock_event = event_add_fd(ev,
+-                                              child,
+-                                              child->sockfd,
+-                                              EVENT_FD_READ,
+-                                              handle_aio_completion,
+-                                              child);
++                      event = event_add_fd(ev,
++                                           frame,
++                                           child->sockfd,
++                                           EVENT_FD_READ,
++                                           handle_aio_completion,
++                                           child);
+ 
+                       while (1) {
+                               if (tevent_loop_once(ev) == -1) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series  2012-04-11 15:54:58.000000000 +0200
+++ new/patches/series  2012-04-30 18:49:34.000000000 +0200
@@ -37,6 +37,12 @@
 samba.org/8852ad6bd77b44e9dd71de3994869f5603964ef7 -p0 # bso 8599
 samba.org/28150366a958a3133dc8e418695b914f2ff3f472 -p0 # bso 8797
 samba.org/8c4491c6ad126771eafa8ea0f54f733f52437a10 -p0 # bso 8807, bnc 751454
+samba.org/ad6d51892597336aa162452f3944393fa5afa7c4 -p0 # bso 7564
+samba.org/ee81564123be5e21b87e7003b51467180c3fdcb5 -p0 # bso 8836
+samba.org/b4abc44a370b8196c72d58a2ed4d8c9bcbc49d17 -p0 # bso 8836
+samba.org/6edb03ed1678c4301c559e2f67c131450d3a8cfa -p0 # bso 8789
+samba.org/3bdcf3208c8ff1a99bc457549257af83a869b381 -p0 # bso 8845
+samba.org/e538c0b1f99853e2921c48db28ef32d33f4fd50d -p0 # bso 8826
 
 # SuSE specific changes
 # disabled -> WIP lmuelle

++++++ samba-3.6.4.tar.bz2 -> samba-3.6.5.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/samba/samba-3.6.4.tar.bz2 
/work/SRC/openSUSE:Factory/.samba.new/samba-3.6.5.tar.bz2 differ: char 11, line 
1

++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor-files/tools/package-data 
new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2012-04-11 15:59:23.000000000 +0200
+++ new/vendor-files/tools/package-data 2012-04-30 18:53:26.000000000 +0200
@@ -1,2 +1,2 @@
 # This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2784"
+SAMBA_PACKAGE_SVN_VERSION="2798"

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to