Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked
in at 2014-06-02 07:00:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2014-05-22
09:04:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2014-06-02
07:00:46.000000000 +0200
@@ -1,0 +2,10 @@
+Fri May 23 10:41:11 UTC 2014 - lmue...@suse.com
+
+- examples/libsmbclient: avoid some compiler warnings; (bso#10624).
+
+-------------------------------------------------------------------
+Thu May 22 13:08:13 UTC 2014 - dd...@suse.com
+
+- Fix printer job purging; (bso#10612); (bnc#879390).
+
+-------------------------------------------------------------------
@@ -98 +108,2 @@
-- Fix malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; (bnc#872396).
+- Fix malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; CVE-2014-0178;
+ (bso#10549); (bnc#872396).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.DBFh9W/_old 2014-06-02 07:00:48.000000000 +0200
+++ /var/tmp/diff_new_pack.DBFh9W/_new 2014-06-02 07:00:48.000000000 +0200
@@ -144,7 +144,7 @@
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
-%define SOURCE_TIMESTAMP 3238
+%define SOURCE_TIMESTAMP 3243
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/57a4319baaee011f2604eadeac655ff1c84d4312
new/patches/samba.org/57a4319baaee011f2604eadeac655ff1c84d4312
--- old/patches/samba.org/57a4319baaee011f2604eadeac655ff1c84d4312
2014-04-30 15:48:20.000000000 +0200
+++ new/patches/samba.org/57a4319baaee011f2604eadeac655ff1c84d4312
2014-05-22 18:27:13.000000000 +0200
@@ -20,9 +20,9 @@
source4/torture/rpc/fsrvp.c | 5 +++--
3 files changed, 11 insertions(+), 8 deletions(-)
-diff --git librpc/idl/fsrvp.idl librpc/idl/fsrvp.idl
-index 5fb79aa..9bcf10c 100644
---- librpc/idl/fsrvp.idl
+Index: librpc/idl/fsrvp.idl
+===================================================================
+--- librpc/idl/fsrvp.idl.orig
+++ librpc/idl/fsrvp.idl
@@ -22,12 +22,6 @@ import "misc.idl";
const uint32 FSRVP_E_OBJECT_NOT_FOUND = 0x80042308;
@@ -37,9 +37,9 @@
typedef struct {
GUID ShadowCopySetId;
GUID ShadowCopyId;
-diff --git source3/rpcclient/cmd_fss.c source3/rpcclient/cmd_fss.c
-index 945f4d9..54fade7 100644
---- source3/rpcclient/cmd_fss.c
+Index: source3/rpcclient/cmd_fss.c
+===================================================================
+--- source3/rpcclient/cmd_fss.c.orig
+++ source3/rpcclient/cmd_fss.c
@@ -23,6 +23,7 @@
#include "rpcclient.h"
@@ -49,7 +49,7 @@
static const struct {
uint32_t error_code;
-@@ -100,6 +101,13 @@ static const char *get_error_str(uint32_t code)
+@@ -100,6 +101,13 @@ static const char *get_error_str(uint32_
break;
}
}
@@ -63,9 +63,9 @@
return result;
};
-diff --git source4/torture/rpc/fsrvp.c source4/torture/rpc/fsrvp.c
-index f9bd2f3..7ed4c0f 100644
---- source4/torture/rpc/fsrvp.c
+Index: source4/torture/rpc/fsrvp.c
+===================================================================
+--- source4/torture/rpc/fsrvp.c.orig
+++ source4/torture/rpc/fsrvp.c
@@ -36,6 +36,7 @@
#include "libcli/smb2/smb2_calls.h"
@@ -75,7 +75,7 @@
#include "torture/torture.h"
#include "torture/smb2/proto.h"
#include "torture/rpc/torture_rpc.h"
-@@ -461,7 +462,7 @@ static bool test_fsrvp_sc_set_abort(struct torture_context
*tctx,
+@@ -384,7 +385,7 @@ static bool test_fsrvp_sc_set_abort(stru
"following abort");
/*
* XXX Windows 8 server beta returns FSRVP_E_BAD_STATE here rather than
@@ -84,7 +84,7 @@
*/
torture_assert(tctx, (r_scset_add.out.result != 0),
"incorrect AddToShadowCopySet response following abort");
-@@ -502,7 +503,7 @@ static bool test_fsrvp_bad_id(struct torture_context *tctx,
+@@ -425,7 +426,7 @@ static bool test_fsrvp_bad_id(struct tor
torture_assert_ntstatus_ok(tctx, status,
"DeleteShareMapping failed");
torture_assert_int_equal(tctx, r_sharemap_del.out.result,
@@ -93,6 +93,3 @@
"incorrect DeleteShareMapping response");
torture_assert(tctx, test_fsrvp_sc_delete(tctx, p, sc_map), "sc del");
---
-1.8.1.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/c8519003a34dc7db44854a3d844d1c7432d52a78
new/patches/samba.org/c8519003a34dc7db44854a3d844d1c7432d52a78
--- old/patches/samba.org/c8519003a34dc7db44854a3d844d1c7432d52a78
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/c8519003a34dc7db44854a3d844d1c7432d52a78
2014-05-23 11:04:59.000000000 +0200
@@ -0,0 +1,116 @@
+commit c8519003a34dc7db44854a3d844d1c7432d52a78
+Author: Stefan Metzmacher <me...@samba.org>
+Date: Thu Feb 27 09:39:20 2014 +0100
+
+ examples/libsmbclient: avoid some compiler warnings
+
+ Signed-off-by: Stefan Metzmacher <me...@samba.org>
+ Reviewed-by: Andrew Bartlett <abart...@samba.org>
+
+diff --git examples/libsmbclient/testacl2.c examples/libsmbclient/testacl2.c
+index ef044f8..a74a72d 100644
+--- examples/libsmbclient/testacl2.c
++++ examples/libsmbclient/testacl2.c
+@@ -25,6 +25,7 @@ int main(int argc, const char *argv[])
+ int ret;
+ const char *debugstr;
+ char value[1024];
++ SMBCCTX *context;
+
+ if (smbc_init(get_auth_data_fn, debug) != 0)
+ {
+@@ -32,7 +33,7 @@ int main(int argc, const char *argv[])
+ return 1;
+ }
+
+- SMBCCTX *context = smbc_set_context(NULL);
++ context = smbc_set_context(NULL);
+ smbc_setOptionFullTimeNames(context, 1);
+
+ the_acl = strdup("system.nt_sec_desc.*");
+diff --git examples/libsmbclient/testbrowse.c
examples/libsmbclient/testbrowse.c
+index 2ae7ca1..0629653 100644
+--- examples/libsmbclient/testbrowse.c
++++ examples/libsmbclient/testbrowse.c
+@@ -25,8 +25,7 @@ get_auth_data_with_context_fn(SMBCCTX * context,
+ char * pPassword,
+ int maxLenPassword);
+
+-int
+-main(int argc, char * argv[])
++int main(int argc, const char *argv[])
+ {
+ int debug = 0;
+ int debug_stderr = 0;
+@@ -73,7 +72,7 @@ main(int argc, char * argv[])
+
+ setbuf(stdout, NULL);
+
+- pc = poptGetContext("opendir", argc, (const char **)argv, long_options,
0);
++ pc = poptGetContext("opendir", argc, argv, long_options, 0);
+
+ poptSetOtherOptionHelp(pc, "");
+
+@@ -100,7 +99,7 @@ main(int argc, char * argv[])
+ if (context_auth) {
+ smbc_setFunctionAuthDataWithContext(context,
+ get_auth_data_with_context_fn);
+- smbc_setOptionUserData(context, (void *)"hello world");
++ smbc_setOptionUserData(context, strdup("hello world"));
+ } else {
+ smbc_setFunctionAuthData(context, get_auth_data_fn);
+ }
+@@ -126,20 +125,22 @@ main(int argc, char * argv[])
+
+ if (scan)
+ {
+- for (;
+- iterations == -1 || iterations > 0;
+- iterations = (iterations == -1 ? iterations : --iterations))
+- {
++ for (; iterations != 0;) {
++ if (iterations > 0) {
++ iterations--;
++ }
++
+ snprintf(buf, sizeof(buf), "smb://");
+ browse(buf, scan, 0);
+ }
+ }
+ else
+ {
+- for (;
+- iterations == -1 || iterations > 0;
+- iterations = (iterations == -1 ? iterations : --iterations))
+- {
++ for (; iterations != 0;) {
++ if (iterations > 0) {
++ iterations--;
++ }
++
+ fputs("url: ", stdout);
+ p = fgets(buf, sizeof(buf), stdin);
+ if (! p)
+diff --git examples/libsmbclient/testctx.c examples/libsmbclient/testctx.c
+index cec9776..7f27fbd 100644
+--- examples/libsmbclient/testctx.c
++++ examples/libsmbclient/testctx.c
+@@ -1,15 +1,16 @@
+ #include <libsmbclient.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+
+-void create_and_destroy_context (void)
++static void create_and_destroy_context (void)
+ {
+ int i;
+ SMBCCTX *ctx;
+ ctx = smbc_new_context ();
+ /* Both should do the same thing */
+ smbc_setOptionDebugToStderr(ctx, 1);
+- smbc_option_set(ctx, "debug_to_stderr", 1);
++ smbc_option_set(ctx, strdup("debug_to_stderr"), 1);
+ smbc_setDebug(ctx, 1);
+ i = smbc_getDebug(ctx);
+ if (i != 1) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67
new/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67
--- old/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67
2014-05-22 18:27:13.000000000 +0200
@@ -0,0 +1,57 @@
+From efb4684a3fc0b32a71eab013000f730e6b144a67 Mon Sep 17 00:00:00 2001
+From: David Disseldorp <dd...@samba.org>
+Date: Wed, 21 May 2014 21:55:58 +0200
+Subject: [PATCH] printing: fix purge of all print jobs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The incorrect (system) jobid is currently passed to the job deletion
+function.
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=10612
+
+Reported-by: Franz Pförtsch <franz.pfoert...@brose.com>
+Signed-off-by: David Disseldorp <dd...@samba.org>
+Reviewed-by: Jeremy Allison <j...@samba.org>
+---
+ source3/printing/printing.c | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+Index: source3/printing/printing.c
+===================================================================
+--- source3/printing/printing.c.orig
++++ source3/printing/printing.c
+@@ -3373,13 +3373,28 @@ WERROR print_queue_purge(const struct au
+ if ( can_job_admin )
+ become_root();
+
+- for (i=0;i<njobs;i++) {
+- bool owner = is_owner(server_info, lp_const_servicename(snum),
+- queue[i].sysjob);
++ for (i = 0; i < njobs; i++) {
++ struct tdb_print_db *pdb;
++ int jobid;
++ bool owner;
++ pdb = get_print_db_byname(lp_const_servicename(snum));
++ if (pdb == NULL) {
++ DEBUG(1, ("failed to find printdb for %s\n",
++ lp_const_servicename(snum)));
++ continue;
++ }
++ jobid = sysjob_to_jobid_pdb(pdb, queue[i].sysjob);
++ if (jobid == (uint32_t)-1) {
++ DEBUG(2, ("jobid for system job %d not found\n",
++ queue[i].sysjob));
++ continue; /* unix job */
++ }
++ owner = is_owner(server_info, lp_const_servicename(snum),
++ jobid);
+
+ if (owner || can_job_admin) {
+ print_job_delete1(server_event_context(), msg_ctx,
+- snum, queue[i].sysjob);
++ snum, jobid);
+ }
+ }
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2014-05-06 19:48:32.000000000 +0200
+++ new/patches/series 2014-05-23 12:47:48.000000000 +0200
@@ -71,14 +71,16 @@
samba.org/4f979525e4137c536118a9c2b2b4ef798c270e27 -p0 # bnc 860809
samba.org/ca3998d0436747f637b04eb32eb6c17fce3e2159 -p0 # bnc 865641
samba.org/cbc6082ec75ee97ae28d94ccfb92c3d93705798a -p0 # bso 10521, bnc 870957
-samba.org/30e724cbff1ecd90e5a676831902d1e41ec1b347 -p0 # bnc 872396
-samba.org/eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696 -p0 # bnc 872396
+samba.org/30e724cbff1ecd90e5a676831902d1e41ec1b347 -p0 # bso 10549, bnc
872396, CVE-2014-0178
+samba.org/eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696 -p0 # bso 10549, bnc
872396, CVE-2014-0178
samba.org/04e434661fa6b5f13776f925b0a7cbadb6b6d006 -p0 # bnc 873658
samba.org/05daf6a25ecbe928987446f39e2d7855328195d1 -p0 # bnc 866927
samba.org/3ac9cb3d17c5252383e8f971818a426c6ad68c2d -p0 # bnc 866927
samba.org/027afd11ca404f24726013d0f9805f42b14e59d7 -p0 # bnc 866927
samba.org/57a4319baaee011f2604eadeac655ff1c84d4312 -p0 # bnc 866927
samba.org/4f9dd94819b5cebe53bbc34d69df408f2eb1e800 -p0 # bnc 866927
+samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67 -p0 # bso 10612, bnc 879390
+samba.org/c8519003a34dc7db44854a3d844d1c7432d52a78 -p0 # bso 10624
samba.org/fix_pc_dependencies.diff -p0
# SuSE specific changes
++++++ 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 2014-05-18 14:13:34.000000000 +0200
+++ new/vendor-files/tools/package-data 2014-05-23 12:52:25.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3238"
+SAMBA_PACKAGE_SVN_VERSION="3243"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
