The branch, v3-6-test has been updated
via 09f3c92... s3-spoolss: fix type-punned pointer build warning.
via 7ba6c37... s3-spoolss: fix uninitialized variable build warning.
via b663c8c... s3-printing: make sure to set NTSTATUS code before
checking it.
via fc94b27... s3-spoolss: remove duplicate (and incorrect) header.
from 4c3f51b... make scannedonly notify the scanner if no .scanned: file
was found during rename
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 09f3c927bc6577d6613f88a345ee869df7cfec8b
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 15:13:57 2010 +0200
s3-spoolss: fix type-punned pointer build warning.
Guenther
(cherry picked from commit bf19a5228aa582e35d1447cb918a1f66bfdf8b2d)
commit 7ba6c37c79d4dfcc75238d2d2db9573b271ffceb
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 14:51:27 2010 +0200
s3-spoolss: fix uninitialized variable build warning.
Andreas, please check.
Guenther
(cherry picked from commit 743a2dedf42c2aa3e9e6caee92e3e9581ae56dce)
commit b663c8ce907794072460bc9841d9a9797282c970
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 13:18:01 2010 +0200
s3-printing: make sure to set NTSTATUS code before checking it.
Andreas, please check.
Guenther
(cherry picked from commit c530aa33cd9ac75bdd79754a2886bff54115800a)
commit fc94b272d6f61d779c5b3fab7468727f4df77493
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 00:12:27 2010 +0200
s3-spoolss: remove duplicate (and incorrect) header.
Guenther
(cherry picked from commit eab6d8c390f34ab331115a190735cb010ca59829)
-----------------------------------------------------------------------
Summary of changes:
source3/printing/nt_printing.c | 1 -
source3/printing/nt_printing_migrate.c | 10 +++++-----
source3/rpc_server/srv_spoolss_nt.c | 2 +-
source3/rpc_server/srv_spoolss_util.c | 4 +++-
4 files changed, 9 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index c9ce969..f0460f3 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -30,7 +30,6 @@
#include "../librpc/gen_ndr/ndr_spoolss.h"
#include "rpc_server/srv_spoolss_util.h"
#include "nt_printing.h"
-#include "../rpc_server/srv_spoolss_util.h"
/* Map generic permissions to printer object specific permissions */
diff --git a/source3/printing/nt_printing_migrate.c
b/source3/printing/nt_printing_migrate.c
index 624d245..1ee5578 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -536,11 +536,11 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
}
if (strncmp((const char *) kbuf.dptr, PRINTERS_PREFIX,
strlen(PRINTERS_PREFIX)) == 0) {
- migrate_printer(mem_ctx,
- pipe_hnd,
- (const char *) kbuf.dptr +
strlen(PRINTERS_PREFIX),
- dbuf.dptr,
- dbuf.dsize);
+ status = migrate_printer(mem_ctx,
+ pipe_hnd,
+ (const char *) kbuf.dptr +
strlen(PRINTERS_PREFIX),
+ dbuf.dptr,
+ dbuf.dsize);
SAFE_FREE(dbuf.dptr);
if (!NT_STATUS_IS_OK(status)) {
tdb_close(tdb);
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index b62a7c0..d0473ed 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -447,7 +447,7 @@ static bool set_printer_hnd_name(TALLOC_CTX *mem_ctx,
int n_services=lp_numservices();
char *aprinter;
const char *printername;
- const char *servername;
+ const char *servername = NULL;
fstring sname;
bool found = false;
struct spoolss_PrinterInfo2 *info2 = NULL;
diff --git a/source3/rpc_server/srv_spoolss_util.c
b/source3/rpc_server/srv_spoolss_util.c
index 819a1dd..3f5e265 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -4044,13 +4044,15 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
for (i = 0; i < num_values; i++) {
const char *tmp_str;
+ uint32_t tmp = 0;
v = &enum_values[i];
result = winreg_enumval_to_dword(info8, v,
"Version",
- (uint32_t *) &info8->version);
+ &tmp);
CHECK_ERROR(result);
+ info8->version = tmp;
result = winreg_enumval_to_sz(info8, v,
"Driver",
--
Samba Shared Repository
