[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-230-gbe479b6
The branch, master has been updated
via be479b6adf3e2041c3249baa24afb8029309e447 (commit)
from c9496ba18a52a4e80fd81c0dfa08129f95edeedb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit be479b6adf3e2041c3249baa24afb8029309e447
Author: Björn Jacke
Date: Wed Mar 4 16:52:12 2009 +0100
don't rely on shebang's perl path, call our $PERL instead
Signed-off-by: Stefan Metzmacher
---
Summary of changes:
source4/selftest/tests.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 39e6cff..821db06 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -291,7 +291,7 @@ if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
for f in $samba4srcdir/../pidl/tests/*.pl; do
- plantest "pidl.`basename $f .pl`" none $PERL $f "|"
$samba4srcdir/../lib/subunit/harness2subunit.pl
+ plantest "pidl.`basename $f .pl`" none $PERL $f "|" $PERL
$samba4srcdir/../lib/subunit/harness2subunit.pl
done
else
echo "Skipping pidl tests - Test::More not installed"
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-229-gc9496ba
The branch, master has been updated
via c9496ba18a52a4e80fd81c0dfa08129f95edeedb (commit)
from d75d3502875f35cfabb9a41528f43f2fd129527c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c9496ba18a52a4e80fd81c0dfa08129f95edeedb
Author: Günther Deschner
Date: Sat Mar 7 01:12:18 2009 +0100
s3-spoolss: remove more leftovers from old enumports call.
Guenther
---
Summary of changes:
source3/include/proto.h |6 ---
source3/include/rpc_spoolss.h | 16
source3/rpc_parse/parse_spoolss.c | 77 -
3 files changed, 0 insertions(+), 99 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index df482be..5cd4e45 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5838,16 +5838,12 @@ bool smb_io_printer_info_5(const char *desc, RPC_BUFFER
*buffer, PRINTER_INFO_5
bool smb_io_printer_info_6(const char *desc, RPC_BUFFER *buffer,
PRINTER_INFO_6 *info, int depth);
bool smb_io_printer_info_7(const char *desc, RPC_BUFFER *buffer,
PRINTER_INFO_7 *info, int depth);
-bool smb_io_port_info_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1
*info, int depth);
-bool smb_io_port_info_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2
*info, int depth);
bool smb_io_printer_driver_info_1(const char *desc, RPC_BUFFER *buffer,
DRIVER_INFO_1 *info, int depth) ;
bool smb_io_printer_driver_info_2(const char *desc, RPC_BUFFER *buffer,
DRIVER_INFO_2 *info, int depth) ;
bool smb_io_printer_driver_info_3(const char *desc, RPC_BUFFER *buffer,
DRIVER_INFO_3 *info, int depth);
bool smb_io_printer_driver_info_6(const char *desc, RPC_BUFFER *buffer,
DRIVER_INFO_6 *info, int depth);
bool smb_io_job_info_1(const char *desc, RPC_BUFFER *buffer, JOB_INFO_1 *info,
int depth);
bool smb_io_job_info_2(const char *desc, RPC_BUFFER *buffer, JOB_INFO_2 *info,
int depth);
-bool smb_io_port_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info,
int depth);
-bool smb_io_port_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *info,
int depth);
uint32 spoolss_size_printer_info_0(PRINTER_INFO_0 *info);
uint32 spoolss_size_printer_info_1(PRINTER_INFO_1 *info);
uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info);
@@ -5863,8 +5859,6 @@ uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3
*info);
uint32 spoolss_size_printer_driver_info_6(DRIVER_INFO_6 *info);
uint32 spoolss_size_job_info_1(JOB_INFO_1 *info);
uint32 spoolss_size_job_info_2(JOB_INFO_2 *info);
-uint32 spoolss_size_port_info_1(PORT_INFO_1 *info);
-uint32 spoolss_size_port_info_2(PORT_INFO_2 *info);
uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
bool spoolss_io_q_getprinterdriver2(const char *desc,
SPOOL_Q_GETPRINTERDRIVER2 *q_u, prs_struct *ps, int depth);
bool spoolss_io_r_getprinterdriver2(const char *desc,
SPOOL_R_GETPRINTERDRIVER2 *r_u, prs_struct *ps, int depth);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 57ac7cf..fdce63a 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -683,22 +683,6 @@ typedef struct spool_r_enumjobs
}
SPOOL_R_ENUMJOBS;
-typedef struct s_port_info_1
-{
- UNISTR port_name;
-}
-PORT_INFO_1;
-
-typedef struct s_port_info_2
-{
- UNISTR port_name;
- UNISTR monitor_name;
- UNISTR description;
- uint32 port_type;
- uint32 reserved;
-}
-PORT_INFO_2;
-
typedef struct job_info_info
{
union
diff --git a/source3/rpc_parse/parse_spoolss.c
b/source3/rpc_parse/parse_spoolss.c
index b111fb6..337121d 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1090,52 +1090,6 @@ bool smb_io_job_info_2(const char *desc, RPC_BUFFER
*buffer, JOB_INFO_2 *info, i
}
/***
- Parse a PORT_INFO_1 structure.
-/
-
-bool smb_io_port_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info,
int depth)
-{
- prs_struct *ps=&buffer->prs;
-
- prs_debug(ps, depth, desc, "smb_io_port_1");
- depth++;
-
- buffer->struct_start=prs_offset(ps);
-
- if(!smb_io_relstr("port_name", buffer, depth, &info->port_name))
- return False;
-
- return True;
-}
-
-/***
- Parse a PORT_INFO_2 structure.
-/
-
-bool smb_io_port_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *info,
int depth)
-{
- prs_struct *ps=&buffer->prs;
-
- prs_debug(ps, depth, desc, "smb_io_port_2");
- depth++;
-
- buffer->struct_start=prs_offs
Build status as of Sat Mar 7 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-03-06 00:00:25.0 + +++ /home/build/master/cache/broken_results.txt 2009-03-07 00:00:35.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Mar 6 00:00:02 2009 +Build status as of Sat Mar 7 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -11,13 +11,13 @@ lorikeet-heimdal 26 14 0 pidl 20 3 0 ppp 12 0 0 -rsync29 10 0 +rsync28 10 0 samba-docs 0 0 0 samba-gtk5 5 0 -samba_3_X_devel 28 26 0 +samba_3_X_devel 27 25 0 samba_3_X_test 27 27 1 samba_4_0_test 29 28 2 -smb-build28 6 0 +smb-build27 6 0 talloc 29 29 0 tdb 27 8 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-228-gd75d350
The branch, master has been updated via d75d3502875f35cfabb9a41528f43f2fd129527c (commit) via 33a441b0c223bc87abdac9dcc8a87dbf13e883f5 (commit) via d8a05bd55dd0e1602082376f31a21045a4a7bbee (commit) via 2561b2d2e275bf1ca1aa7cab8b3942cff7d8b5f7 (commit) via a3e5cf3ba66e2ea23bc8919593a03402d7f432bd (commit) via 45a22eab52860bb04b29796834a2561d3679964a (commit) via e9179a6850a99d9d6ec25eba86ec02c9c1279850 (commit) via c7e19c2627e5a336f506ad6e781547288e1b10c5 (commit) via 631f277d1cd81de6d796888754b08e2443edad3d (commit) via 03f1bec6cea2749bcfb9b77b5eb220cfc17f22d0 (commit) via 48ba1328334dd23e46e86707071643d0cc6ae92b (commit) via 34f469f19f1a4bebbaf7f13d65d71ee172606d51 (commit) via 62d73b8854b5a0a900c9abb3a60a2b089579886e (commit) via 2d24d3a3800fda96d266aead26286fbb3008339c (commit) via f9019c18375d3b63d21aa6ed346620c487d379fb (commit) via 3cf22a88562ccbab79c2a4a389fa6559cda71319 (commit) via a58e59fc6ed0ee91c8761cbda62c34e35e6dd153 (commit) via b73411d650d4d4bed99b75ffb36a1ab0dad9d4a8 (commit) via 066a47b9940b9ecc6a5c6d022444a17effac4855 (commit) via f48ccec957c1ea943ad88304c40e37e803f6e9fb (commit) via 9f27a0813c4edfacdd9f45dce4383ccc69a3d317 (commit) via 6fd5128b99136dc4726a5b578fc500ed0b2bffc9 (commit) from a93fbf8b2648f34a4a08de48c2b68eeb2ee7088d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d75d3502875f35cfabb9a41528f43f2fd129527c Author: Günther Deschner Date: Sat Mar 7 00:16:10 2009 +0100 s3-rpcclient: add enummonitors command to enumerate print monitors. Guenther commit 33a441b0c223bc87abdac9dcc8a87dbf13e883f5 Author: Günther Deschner Date: Sat Mar 7 00:10:15 2009 +0100 s3-spoolss: add rpccli_spoolss_enummonitors convenience wrapper. Guenther commit d8a05bd55dd0e1602082376f31a21045a4a7bbee Author: Günther Deschner Date: Sat Mar 7 00:04:48 2009 +0100 s3-spoolss: remove old spoolss_EnumMonitors. Guenther commit 2561b2d2e275bf1ca1aa7cab8b3942cff7d8b5f7 Author: Günther Deschner Date: Sat Mar 7 00:04:05 2009 +0100 s3-spoolss: use pidl for _spoolss_EnumMonitors. Guenther commit a3e5cf3ba66e2ea23bc8919593a03402d7f432bd Author: Günther Deschner Date: Sat Mar 7 00:01:11 2009 +0100 s3: re-run make samba3-idl. Guenther commit 45a22eab52860bb04b29796834a2561d3679964a Author: Günther Deschner Date: Sat Mar 7 00:00:27 2009 +0100 spoolss: flag spoolss_MonitorInfo structs [public,gensize]. Guenther commit e9179a6850a99d9d6ec25eba86ec02c9c1279850 Author: Günther Deschner Date: Fri Mar 6 23:36:31 2009 +0100 s3-rpcclient: use rpccli_spoolss_enumports wrapper. Guenther commit c7e19c2627e5a336f506ad6e781547288e1b10c5 Author: Günther Deschner Date: Fri Mar 6 23:27:45 2009 +0100 s3-spoolss: add rpccli_spoolss_enumports convenience wrapper. Guenther commit 631f277d1cd81de6d796888754b08e2443edad3d Author: Günther Deschner Date: Fri Mar 6 23:39:23 2009 +0100 s3-spoolss: remove old spoolss_EnumPorts. Guenther commit 03f1bec6cea2749bcfb9b77b5eb220cfc17f22d0 Author: Günther Deschner Date: Fri Mar 6 23:38:57 2009 +0100 s3-spoolss: use pidl for _spoolss_EnumPorts. Guenther commit 48ba1328334dd23e46e86707071643d0cc6ae92b Author: Günther Deschner Date: Fri Mar 6 23:37:42 2009 +0100 s3: re-run make samba3-idl. Guenther commit 34f469f19f1a4bebbaf7f13d65d71ee172606d51 Author: Günther Deschner Date: Fri Mar 6 23:37:14 2009 +0100 spoolss: flag spoolss_PortInfo structs as [public,gensize]. Guenther commit 62d73b8854b5a0a900c9abb3a60a2b089579886e Author: Günther Deschner Date: Sat Mar 7 00:55:15 2009 +0100 s3-rpcclient: add enumprocdatatypes command to enumerate print processor data types. Guenther commit 2d24d3a3800fda96d266aead26286fbb3008339c Author: Günther Deschner Date: Fri Mar 6 22:22:49 2009 +0100 s3-spoolss: add rpccli_spoolss_enumprintprocessordatatypes convenience wrapper. Guenther commit f9019c18375d3b63d21aa6ed346620c487d379fb Author: Günther Deschner Date: Fri Mar 6 21:51:52 2009 +0100 s3-spoolss: remove old spoolss_EnumPrintProcDataTypes. Guenther commit 3cf22a88562ccbab79c2a4a389fa6559cda71319 Author: Günther Deschner Date: Fri Mar 6 21:51:12 2009 +0100 s3-spoolss: use pidl for _spoolss_EnumPrintProcDataTypes. Guenther commit a58e59fc6ed0ee91c8761cbda62c34e35e6dd153 Author: Günther Deschner Date: Fri Mar 6 22:11:09 2009 +0100 s3-rpcclient: add enumprocs command to enumerate print processors. Guenther commit b73411d650d4d4bed99b75ffb36a1ab0dad9d4a8 Author: Günther Deschner Date: Fri Mar 6 22:09:47 2009 +0100 s3-s
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-206-ga93fbf8
The branch, master has been updated
via a93fbf8b2648f34a4a08de48c2b68eeb2ee7088d (commit)
via f959aac745d6f1b4b9c3c335f18c2b458832879e (commit)
via e90fcbb90ec8e6f7a54da88bf87b6c2059225872 (commit)
via 2545a75b9a78d56766224cc0c20c795d0f5498c2 (commit)
from bf85a14182f0dfe6d21cda2039c7ccb961419328 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a93fbf8b2648f34a4a08de48c2b68eeb2ee7088d
Author: Günther Deschner
Date: Fri Mar 6 21:50:15 2009 +0100
s4-smbtorture: add test_EnumPrintProcDataTypes to RPC-SPOOLSS test.
Guenther
commit f959aac745d6f1b4b9c3c335f18c2b458832879e
Author: Günther Deschner
Date: Fri Mar 6 21:49:31 2009 +0100
spoolss: add spoolss_EnumPrintProcDataTypes to enum macro helper.
Guenther
commit e90fcbb90ec8e6f7a54da88bf87b6c2059225872
Author: Günther Deschner
Date: Fri Mar 6 21:48:46 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 2545a75b9a78d56766224cc0c20c795d0f5498c2
Author: Günther Deschner
Date: Fri Mar 6 21:48:01 2009 +0100
spoolss: fill in spoolss_EnumPrintProcDataTypes IDL.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c | 16 ++
librpc/gen_ndr/cli_spoolss.h |8 +
librpc/gen_ndr/ndr_spoolss.c | 387 -
librpc/gen_ndr/ndr_spoolss.h | 15 ++
librpc/gen_ndr/spoolss.h | 51 ++
librpc/gen_ndr/srv_spoolss.c | 35
librpc/idl/spoolss.idl| 35 -
librpc/ndr/ndr_spoolss_buf.c | 33
librpc/ndr/ndr_spoolss_buf.h |7 +-
source4/selftest/knownfail|1 +
source4/torture/rpc/spoolss.c | 52 ++
11 files changed, 636 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 87e305f..2e0582e 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -2431,12 +2431,25 @@ NTSTATUS rpccli_spoolss_DeletePrintProvidor(struct
rpc_pipe_client *cli,
NTSTATUS rpccli_spoolss_EnumPrintProcDataTypes(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *servername /* [in]
[unique,charset(UTF16)] */,
+ const char *print_processor_name
/* [in] [unique,charset(UTF16)] */,
+ uint32_t level /* [in] */,
+ DATA_BLOB *buffer /* [in]
[unique] */,
+ uint32_t offered /* [in] */,
+ uint32_t *count /* [out] [ref]
*/,
+ union
spoolss_PrintProcDataTypesInfo **info /* [out]
[ref,switch_is(level),size_is(,*count)] */,
+ uint32_t *needed /* [out] [ref]
*/,
WERROR *werror)
{
struct spoolss_EnumPrintProcDataTypes r;
NTSTATUS status;
/* In parameters */
+ r.in.servername = servername;
+ r.in.print_processor_name = print_processor_name;
+ r.in.level = level;
+ r.in.buffer = buffer;
+ r.in.offered = offered;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(spoolss_EnumPrintProcDataTypes, &r);
@@ -2461,6 +2474,9 @@ NTSTATUS rpccli_spoolss_EnumPrintProcDataTypes(struct
rpc_pipe_client *cli,
}
/* Return variables */
+ *count = *r.out.count;
+ *info = *r.out.info;
+ *needed = *r.out.needed;
/* Return result */
if (werror) {
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index ba766d9..3aebf33 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -315,6 +315,14 @@ NTSTATUS rpccli_spoolss_DeletePrintProvidor(struct
rpc_pipe_client *cli,
WERROR *werror);
NTSTATUS rpccli_spoolss_EnumPrintProcDataTypes(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *servername /* [in]
[unique,charset(UTF16)] */,
+ const char *print_processor_name
/* [in] [unique,charset(UTF16)] */,
+ uint32_t level /* [in] */,
+ DATA_BLOB *buffer /* [in]
[unique] */,
+ uint32_t offered /* [in] */,
+ uint32_t *count /* [out] [ref]
*/,
+ union
spoolss_PrintProcDataTypesInfo **info /* [out]
[ref,sw
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-202-gbf85a14
The branch, master has been updated
via bf85a14182f0dfe6d21cda2039c7ccb961419328 (commit)
via 3f3e15ab91373597390320269f5cd701d3f07a3b (commit)
via 6e572d40a913f788f06e4bc7a7047129bc22ad5a (commit)
via 589eb81e3fe5262d544af2c5032c99b5a4d4ba85 (commit)
via 196a5d038886bdea678ac9ae97bdf9dab825e23f (commit)
via 4b6cbe80b28b7a99ba8f35190d809f5a439fdd22 (commit)
from 918e6288fa775893a7e895334e05ce7780f89eaf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bf85a14182f0dfe6d21cda2039c7ccb961419328
Author: Stefan Metzmacher
Date: Fri Mar 6 16:27:10 2009 +0100
s3:make_test: run CHAIN1 test
metze
commit 3f3e15ab91373597390320269f5cd701d3f07a3b
Author: Stefan Metzmacher
Date: Fri Mar 6 12:01:44 2009 +0100
s3:libsmb: merge cli_setup_signing_state() into cli_initialise_ex()
metze
commit 6e572d40a913f788f06e4bc7a7047129bc22ad5a
Author: Stefan Metzmacher
Date: Fri Mar 6 11:52:15 2009 +0100
s3:libsmb: remove cli_setup_signing_state() and add struct cli_state
*cli_initialise_ex()
This prepares the next changes.
metze
commit 589eb81e3fe5262d544af2c5032c99b5a4d4ba85
Author: Stefan Metzmacher
Date: Fri Mar 6 11:40:21 2009 +0100
s3:winbindd_cm: remove useless cli_setup_signing_state(*cli, Undefined) call
cli_setup_signing_state() with Undefined is a noop.
metze
commit 196a5d038886bdea678ac9ae97bdf9dab825e23f
Author: Stefan Metzmacher
Date: Fri Mar 6 07:45:06 2009 +0100
s3:signing: the seqnum should only be decremented by 1 for ntcancel requests
[MS-SMB] 3.3.5.1 Receiving Any Message says that the seqnum
is incremented by only for ntcancel requests for any other
request it's by incremented by 2, even if it doesn't expect
a response.
metze
commit 4b6cbe80b28b7a99ba8f35190d809f5a439fdd22
Author: Stefan Metzmacher
Date: Fri Mar 6 07:38:41 2009 +0100
s3:errormap: add ECANCELED, ERRDOS/ERRbadfid, NT_STATUS_CANCELLED mapping
If someone knows a better dos error, please tell me...
metze
---
Summary of changes:
source3/include/proto.h|4 +-
source3/lib/errmap_unix.c |3 +
source3/libsmb/cliconnect.c|4 +-
source3/libsmb/clidfs.c|3 +-
source3/libsmb/clientgen.c | 58 +++-
source3/libsmb/smb_signing.c |6 ++-
source3/script/tests/test_smbtorture_s3.sh |2 +-
source3/smbd/aio.c |8 ++--
source3/smbd/nttrans.c |2 +-
source3/winbindd/winbindd_cm.c |2 -
10 files changed, 48 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ffdef43..c8dff53 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2430,8 +2430,8 @@ void cli_setup_packet_buf(struct cli_state *cli, char
*buf);
void cli_setup_packet(struct cli_state *cli);
void cli_setup_bcc(struct cli_state *cli, void *p);
void cli_init_creds(struct cli_state *cli, const char *username, const char
*domain, const char *password);
-void cli_setup_signing_state(struct cli_state *cli, int signing_state);
struct cli_state *cli_initialise(void);
+struct cli_state *cli_initialise_ex(int signing_state);
void cli_nt_pipes_close(struct cli_state *cli);
void cli_shutdown(struct cli_state *cli);
void cli_sockopt(struct cli_state *cli, const char *options);
@@ -3209,7 +3209,7 @@ bool srv_oplock_set_signing(bool onoff);
bool srv_check_sign_mac(const char *inbuf, bool must_be_ok);
void srv_calculate_sign_mac(char *outbuf);
void srv_defer_sign_response(uint16 mid);
-void srv_cancel_sign_response(uint16 mid);
+void srv_cancel_sign_response(uint16 mid, bool cancel);
void srv_set_signing_negotiated(void);
bool srv_is_signing_active(void);
bool srv_is_signing_negotiated(void);
diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c
index 9adb237..bb09726 100644
--- a/source3/lib/errmap_unix.c
+++ b/source3/lib/errmap_unix.c
@@ -95,6 +95,9 @@ const struct unix_error_map unix_dos_nt_errmap[] = {
#ifdef ENOATTR
{ ENOATTR, ERRDOS, ERRbadfile, NT_STATUS_NOT_FOUND },
#endif
+#ifdef ECANCELED
+ { ECANCELED, ERRDOS, ERRbadfid, NT_STATUS_CANCELLED},
+#endif
{ 0, 0, 0, NT_STATUS_OK }
};
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 58e7dd1..e3d1b65 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1949,7 +1949,7 @@ NTSTATUS cli_start_connection(struct cli_state
**output_cli,
if (!my_name)
my_name = global_myname();
- if (!(cli = cli_initialise())) {
+ if (!(cli = cli_initialise_ex(si
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-196-g918e628
The branch, master has been updated
via 918e6288fa775893a7e895334e05ce7780f89eaf (commit)
from 5ce523bbed4196fda6716b71ef6080c3c5522838 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 918e6288fa775893a7e895334e05ce7780f89eaf
Author: Stefan Metzmacher
Date: Fri Mar 6 16:18:50 2009 +0100
s3:libsmb: smb signing works the same for extented and non-extended security
This is only cosmetic, but it makes it easier to understand.
metze
---
Summary of changes:
source3/libsmb/cliconnect.c | 23 ++-
1 files changed, 18 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ad11ee0..58e7dd1 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -379,6 +379,7 @@ static NTSTATUS cli_session_setup_nt1(struct cli_state
*cli, const char *user,
DATA_BLOB session_key = data_blob_null;
NTSTATUS result;
char *p;
+ bool ok;
if (passlen == 0) {
/* do nothing - guest login */
@@ -436,11 +437,7 @@ static NTSTATUS cli_session_setup_nt1(struct cli_state
*cli, const char *user,
SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
#endif
}
-#ifdef LANMAN_ONLY
- cli_simple_set_signing(cli, session_key, lm_response);
-#else
- cli_simple_set_signing(cli, session_key, nt_response);
-#endif
+ cli_temp_set_signing(cli);
} else {
/* pre-encrypted password supplied. Only used for
security=server, can't do
@@ -492,6 +489,22 @@ static NTSTATUS cli_session_setup_nt1(struct cli_state
*cli, const char *user,
goto end;
}
+#ifdef LANMAN_ONLY
+ ok = cli_simple_set_signing(cli, session_key, lm_response);
+#else
+ ok = cli_simple_set_signing(cli, session_key, nt_response);
+#endif
+ if (ok) {
+ /* 'resign' the last message, so we get the right sequence
numbers
+ for checking the first reply from the server */
+ cli_calculate_sign_mac(cli, cli->outbuf);
+
+ if (!cli_check_sign_mac(cli, cli->inbuf)) {
+ result = NT_STATUS_ACCESS_DENIED;
+ goto end;
+ }
+ }
+
/* use the returned vuid from now on */
cli->vuid = SVAL(cli->inbuf,smb_uid);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-195-g5ce523b
The branch, master has been updated
via 5ce523bbed4196fda6716b71ef6080c3c5522838 (commit)
from 8614ce5ca74e71f931d1fa76d59b7c07271717c4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5ce523bbed4196fda6716b71ef6080c3c5522838
Author: Günther Deschner
Date: Fri Mar 6 14:58:49 2009 +0100
s3-spoolss: Fix Coverity ID #891 (UNINIT).
Guenther
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 0c496b9..77f64ae 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -10064,7 +10064,7 @@ WERROR _spoolss_XcvData(pipes_struct *p,
struct spoolss_XcvData *r)
{
Printer_entry *Printer = find_printer_index_by_hnd(p, r->in.handle);
- DATA_BLOB out_data;
+ DATA_BLOB out_data = data_blob_null;
WERROR werror;
if (!Printer) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-194-g8614ce5
The branch, master has been updated
via 8614ce5ca74e71f931d1fa76d59b7c07271717c4 (commit)
via 4541aa5f846bc7b38e2873d65b5b6a5614a037b4 (commit)
from f9bf09e255c20672f1565aa9e3c51d1274958dcf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8614ce5ca74e71f931d1fa76d59b7c07271717c4
Author: Günther Deschner
Date: Fri Mar 6 12:04:47 2009 +0100
s3-spoolss: remove old _spoolss_EnumForms.
Guenther
commit 4541aa5f846bc7b38e2873d65b5b6a5614a037b4
Author: Günther Deschner
Date: Fri Mar 6 12:01:54 2009 +0100
s3-spoolss: use form flags from idl in rpcclient and net.
Guenther
---
Summary of changes:
source3/include/proto.h |4 -
source3/include/rpc_spoolss.h | 35 ---
source3/rpc_parse/parse_spoolss.c | 110 ---
source3/rpc_server/srv_spoolss_nt.c | 15 -
source3/rpcclient/cmd_spoolss.c | 12 ++--
source3/utils/net_rpc_printer.c |2 +-
6 files changed, 7 insertions(+), 171 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8395e2a..ffdef43 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5818,7 +5818,6 @@ bool smb_io_printer_driver_info_3(const char *desc,
RPC_BUFFER *buffer, DRIVER_I
bool smb_io_printer_driver_info_6(const char *desc, RPC_BUFFER *buffer,
DRIVER_INFO_6 *info, int depth);
bool smb_io_job_info_1(const char *desc, RPC_BUFFER *buffer, JOB_INFO_1 *info,
int depth);
bool smb_io_job_info_2(const char *desc, RPC_BUFFER *buffer, JOB_INFO_2 *info,
int depth);
-bool smb_io_form_1(const char *desc, RPC_BUFFER *buffer, FORM_1 *info, int
depth);
bool smb_io_port_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info,
int depth);
bool smb_io_port_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *info,
int depth);
bool smb_io_printprocessor_info_1(const char *desc, RPC_BUFFER *buffer,
PRINTPROCESSOR_1 *info, int depth);
@@ -5840,7 +5839,6 @@ uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3
*info);
uint32 spoolss_size_printer_driver_info_6(DRIVER_INFO_6 *info);
uint32 spoolss_size_job_info_1(JOB_INFO_1 *info);
uint32 spoolss_size_job_info_2(JOB_INFO_2 *info);
-uint32 spoolss_size_form_1(FORM_1 *info);
uint32 spoolss_size_port_info_1(PORT_INFO_1 *info);
uint32 spoolss_size_port_info_2(PORT_INFO_2 *info);
uint32 spoolss_size_printprocessor_info_1(PRINTPROCESSOR_1 *info);
@@ -5880,8 +5878,6 @@ bool
make_spoolss_q_enumprinterdrivers(SPOOL_Q_ENUMPRINTERDRIVERS *q_u,
uint32 level,
RPC_BUFFER *buffer, uint32 offered);
bool spoolss_io_q_enumprinterdrivers(const char *desc,
SPOOL_Q_ENUMPRINTERDRIVERS *q_u, prs_struct *ps, int depth);
-bool spoolss_io_q_enumforms(const char *desc, SPOOL_Q_ENUMFORMS *q_u,
prs_struct *ps, int depth);
-bool spoolss_io_r_enumforms(const char *desc, SPOOL_R_ENUMFORMS *r_u,
prs_struct *ps, int depth);
bool spoolss_io_r_enumports(const char *desc, SPOOL_R_ENUMPORTS *r_u,
prs_struct *ps, int depth);
bool spoolss_io_q_enumports(const char *desc, SPOOL_Q_ENUMPORTS *q_u,
prs_struct *ps, int depth);
bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len,
uint16 *src);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 2b4a036..e101a27 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -769,41 +769,6 @@ typedef struct spool_r_enumprinterdrivers
}
SPOOL_R_ENUMPRINTERDRIVERS;
-#define FORM_USER0
-#define FORM_BUILTIN 1
-#define FORM_PRINTER 2
-
-typedef struct spool_form_1
-{
- uint32 flag;
- UNISTR name;
- uint32 width;
- uint32 length;
- uint32 left;
- uint32 top;
- uint32 right;
- uint32 bottom;
-}
-FORM_1;
-
-typedef struct spool_q_enumforms
-{
- POLICY_HND handle;
- uint32 level;
- RPC_BUFFER *buffer;
- uint32 offered;
-}
-SPOOL_Q_ENUMFORMS;
-
-typedef struct spool_r_enumforms
-{
- RPC_BUFFER *buffer;
- uint32 needed;
- uint32 numofforms;
- WERROR status;
-}
-SPOOL_R_ENUMFORMS;
-
//
typedef struct spool_q_enumprintprocessors
diff --git a/source3/rpc_parse/parse_spoolss.c
b/source3/rpc_parse/parse_spoolss.c
index e323606..181ad0e 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1136,40 +1136,6 @@ bool smb_io_job_info_2(const char *desc, RPC_BUFFER
*buffer, JOB_INFO_2 *info, i
}
/***
-/
-
-bool smb_io_form_1(const char *desc, RPC_BUFFER *buffer, FORM_1 *info, int
depth)
-{
- prs_struct *p
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-192-gf9bf09e
The branch, master has been updated
via f9bf09e255c20672f1565aa9e3c51d1274958dcf (commit)
via c9de2300bb2c073f42fed15abd56c47f349b8e65 (commit)
via 6aea116cf361ade8cc90bd5bceb04aba2dcb97c9 (commit)
from 9bdca59fc5b579c8aafbd6cb7aa1524e1417ca64 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f9bf09e255c20672f1565aa9e3c51d1274958dcf
Author: Günther Deschner
Date: Fri Mar 6 12:01:14 2009 +0100
s3-spoolss: use pidl for _spoolss_EnumForms.
Guenther
commit c9de2300bb2c073f42fed15abd56c47f349b8e65
Author: Günther Deschner
Date: Fri Mar 6 14:24:20 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 6aea116cf361ade8cc90bd5bceb04aba2dcb97c9
Author: Günther Deschner
Date: Fri Mar 6 12:05:25 2009 +0100
spoolss: flag spoolss_FormInfo1 and 2 with [public,gensize].
Guenther
---
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c| 18 +-
librpc/gen_ndr/ndr_spoolss.h|6 ++
librpc/gen_ndr/spoolss.h|4 +-
librpc/idl/spoolss.idl |4 +-
source3/include/proto.h |1 -
source3/rpc_server/srv_spoolss.c| 22 +---
source3/rpc_server/srv_spoolss_nt.c | 111 ---
7 files changed, 63 insertions(+), 103 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 576965b..c8bc26d 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -14765,7 +14765,7 @@ _PUBLIC_ void ndr_print_spoolss_FormArea(struct
ndr_print *ndr, const char *name
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_FormInfo1(struct ndr_push *ndr, int
ndr_flags, const struct spoolss_FormInfo1 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo1(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_FormInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -14793,7 +14793,7 @@ static enum ndr_err_code
ndr_push_spoolss_FormInfo1(struct ndr_push *ndr, int nd
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_FormInfo1(struct ndr_pull *ndr, int
ndr_flags, struct spoolss_FormInfo1 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo1(struct ndr_pull *ndr,
int ndr_flags, struct spoolss_FormInfo1 *r)
{
uint32_t _ptr_form_name;
TALLOC_CTX *_mem_save_form_name_0;
@@ -14851,6 +14851,11 @@ _PUBLIC_ void ndr_print_spoolss_FormInfo1(struct
ndr_print *ndr, const char *nam
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_FormInfo1(const struct spoolss_FormInfo1 *r,
struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags,
(ndr_push_flags_fn_t)ndr_push_spoolss_FormInfo1, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_FormStringType(struct ndr_push *ndr,
int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
@@ -14875,7 +14880,7 @@ _PUBLIC_ void ndr_print_spoolss_FormStringType(struct
ndr_print *ndr, const char
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int
ndr_flags, const struct spoolss_FormInfo2 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_FormInfo2 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -14951,7 +14956,7 @@ static enum ndr_err_code
ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int nd
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int
ndr_flags, struct spoolss_FormInfo2 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr,
int ndr_flags, struct spoolss_FormInfo2 *r)
{
uint32_t _ptr_form_name;
TALLOC_CTX *_mem_save_form_name_0;
@@ -15120,6 +15125,11 @@ _PUBLIC_ void ndr_print_spoolss_FormInfo2(struct
ndr_print *ndr, const char *nam
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_FormInfo2(const struct spoolss_FormInfo2 *r,
struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags,
(ndr_push_flags_fn_t)ndr_push_spoolss_FormInfo2, ic);
+}
+
_PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo(struct ndr_push *ndr, int
ndr_flags, const union spoolss_FormInfo *r)
{
uint32_t _save_relative_base_offset =
ndr_push_get_relative_base_offset(ndr);
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index eaa16e8..e2160f1 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -353,9 +353,15 @@ size_t ndr_size_spoolss_PrinterData(const union
spoolss_PrinterData *r, uint32_t
void ndr_print_spoolss_FormFlags(stru
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-189-g9bdca59
The branch, master has been updated via 9bdca59fc5b579c8aafbd6cb7aa1524e1417ca64 (commit) via 01e4f63c5e75aadf7556b4ad65d061dea9091c20 (commit) via 6336366abb53436c6800263cc0da26faa13c038c (commit) via c14a589a46ab5d9f80533cda01b6624a80611dc9 (commit) from b4707d8df34d3c1e28270e0c054bcf6b8c3758b5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9bdca59fc5b579c8aafbd6cb7aa1524e1417ca64 Author: Günther Deschner Date: Fri Mar 6 10:55:09 2009 +0100 s3-spoolss: remove old rpccli_spoolss_enumforms. Guenther commit 01e4f63c5e75aadf7556b4ad65d061dea9091c20 Author: Günther Deschner Date: Fri Mar 6 11:02:27 2009 +0100 s3-net: use new rpccli_spoolss_enumforms wrapper. Guenther commit 6336366abb53436c6800263cc0da26faa13c038c Author: Günther Deschner Date: Fri Mar 6 10:55:41 2009 +0100 s3-rpcclient: use new rpccli_spoolss_enumforms wrapper. Guenther commit c14a589a46ab5d9f80533cda01b6624a80611dc9 Author: Günther Deschner Date: Fri Mar 6 10:54:19 2009 +0100 s3-spoolss: add convencience wrapper around rpccli_spoolss_EnumForms. Guenther --- Summary of changes: source3/include/proto.h | 13 ++-- source3/rpc_client/cli_spoolss.c | 137 ++--- source3/rpc_parse/parse_spoolss.c | 16 source3/rpcclient/cmd_spoolss.c | 49 ++ source3/utils/net_rpc_printer.c | 44 +--- 5 files changed, 96 insertions(+), 163 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 0dfa7f0..4ce5ed6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5474,6 +5474,13 @@ WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, uint32_t level, uint32_t offered, union spoolss_JobInfo *info); +WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_FormInfo **info); WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, char *name, uint32 flags, uint32 level, uint32 *num_printers, PRINTER_INFO_CTR *ctr); @@ -5484,9 +5491,6 @@ WERROR rpccli_spoolss_enumprinterdrivers (struct rpc_pipe_client *cli, uint32 level, const char *env, uint32 *num_drivers, PRINTER_DRIVER_CTR *ctr); -WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, -POLICY_HND *handle, int level, uint32 *num_forms, -FORM_1 **forms); WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, uint32 level, uint32 firstjob, uint32 num_jobs, uint32 *returned, JOB_INFO_CTR *ctr); @@ -5917,9 +5921,6 @@ bool spoolss_io_q_enumprinterkey(const char *desc, SPOOL_Q_ENUMPRINTERKEY *q_u, bool spoolss_io_r_enumprinterkey(const char *desc, SPOOL_R_ENUMPRINTERKEY *r_u, prs_struct *ps, int depth); bool spoolss_io_q_enumprinterdataex(const char *desc, SPOOL_Q_ENUMPRINTERDATAEX *q_u, prs_struct *ps, int depth); bool spoolss_io_r_enumprinterdataex(const char *desc, SPOOL_R_ENUMPRINTERDATAEX *r_u, prs_struct *ps, int depth); -bool make_spoolss_q_enumforms(SPOOL_Q_ENUMFORMS *q_u, POLICY_HND *handle, - uint32 level, RPC_BUFFER *buffer, - uint32 offered); /* The following definitions come from rpc_server/srv_eventlog_lib.c */ diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index d76d20c..5e09787 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -279,6 +279,57 @@ WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, return werror; } +/** + convencience wrapper around rpccli_spoolss_EnumForms +**/ + +WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + uint32_t level, + uint32_t offered, + uint32_t
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-185-gb4707d8
The branch, master has been updated
via b4707d8df34d3c1e28270e0c054bcf6b8c3758b5 (commit)
via 75046db121ea858fcc22da7b4410aea9eea70e67 (commit)
via 007f3f231914eaa3fe9ce83c95e0db49d67151d2 (commit)
via 8bc7bb77bebcac9b10f2718f879d92813fe275da (commit)
via 2fcc921237bbaac2de331ee53828ab72394a6186 (commit)
via 8e68eb2cc36c493461c74ee35b0974832d6452c3 (commit)
via 47adaea11e553f30a43ad1dd9ac700a510c9e909 (commit)
via c6aea64e9223f89691e401c08ef82173c55883db (commit)
via 4941e80d0ec0ca61a0edaff15edeb2d58b5be769 (commit)
via fb4ab25eec7d5d2645d3f3d2a6d676e48c0e6284 (commit)
from df145c33822f1fc77e2602709a75c2eac71abab3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b4707d8df34d3c1e28270e0c054bcf6b8c3758b5
Author: Günther Deschner
Date: Fri Mar 6 14:23:44 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 75046db121ea858fcc22da7b4410aea9eea70e67
Author: Günther Deschner
Date: Thu Mar 5 18:35:47 2009 +0100
spoolss: fix [size_is] declaration for enum calls.
This took me ages to find. Thanks metze!
Guenther
commit 007f3f231914eaa3fe9ce83c95e0db49d67151d2
Author: Günther Deschner
Date: Mon Mar 2 18:02:04 2009 +0100
s4-spoolss: fix spoolss server enum calls after pointer changes.
Guenther
commit 8bc7bb77bebcac9b10f2718f879d92813fe275da
Author: Günther Deschner
Date: Fri Mar 6 12:24:23 2009 +0100
s4-smbtorture: exit early in test_EnumPorts when no port info has been
returned.
Guenther
commit 2fcc921237bbaac2de331ee53828ab72394a6186
Author: Günther Deschner
Date: Fri Mar 6 12:20:14 2009 +0100
s4-smbtorture: fix s3 flavor rpc spoolss test.
Guenther
commit 8e68eb2cc36c493461c74ee35b0974832d6452c3
Author: Günther Deschner
Date: Mon Mar 2 17:58:13 2009 +0100
s4-smbtorture: fix RPC-SPOOLSS-WIN.
Guenther
commit 47adaea11e553f30a43ad1dd9ac700a510c9e909
Author: Günther Deschner
Date: Mon Mar 2 17:32:24 2009 +0100
s4-smbtorture: fix RPC-SPOOLSS test after enum out info pointer changes.
Guenther
commit c6aea64e9223f89691e401c08ef82173c55883db
Author: Günther Deschner
Date: Fri Mar 6 13:52:39 2009 +0100
spoolss: fix spoolss enum calls helper macro code after pointer changes.
Guenther
commit 4941e80d0ec0ca61a0edaff15edeb2d58b5be769
Author: Günther Deschner
Date: Mon Mar 2 17:31:29 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit fb4ab25eec7d5d2645d3f3d2a6d676e48c0e6284
Author: Günther Deschner
Date: Mon Mar 2 17:29:15 2009 +0100
spoolss: make all enum out info pointers a pointer to an array.
Without this we never can get a reasonable s3 cli_spoolss fn for the enum
calls.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c| 42 +++--
librpc/gen_ndr/cli_spoolss.h| 14 ++--
librpc/gen_ndr/ndr_spoolss.c| 133 +++---
librpc/gen_ndr/spoolss.h| 14 ++--
librpc/gen_ndr/srv_spoolss.c| 28 +++---
librpc/idl/spoolss.idl | 14 ++--
librpc/ndr/ndr_spoolss_buf.c| 19 +++-
source4/ntptr/simple_ldb/ntptr_simple_ldb.c |8 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 20 ++--
source4/torture/rpc/samba3rpc.c |2 +
source4/torture/rpc/spoolss.c | 50 +++
source4/torture/rpc/spoolss_win.c |8 ++-
12 files changed, 194 insertions(+), 158 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 2aa42b9..87e305f 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -14,7 +14,7 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client
*cli,
DATA_BLOB *buffer /* [in] [unique] */,
uint32_t offered /* [in] */,
uint32_t *count /* [out] [ref] */,
-union spoolss_PrinterInfo *info /* [out]
[unique,switch_is(level),size_is(*count)] */,
+union spoolss_PrinterInfo **info /* [out]
[ref,switch_is(level),size_is(,*count)] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
{
@@ -52,9 +52,7 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client
*cli,
/* Return variables */
*count = *r.out.count;
- if (info && r.out.info) {
- memcpy(info, r.out.info, *count * sizeof(*info));
- }
+ *info = *r.out.info;
*needed = *r.out.needed;
/* Return
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-1-33-gaff7429
The branch, v3-3-stable has been updated via aff7429440784c41666d978e2b74784f36f87d98 (commit) via 5afa5a02307635d71f54b6e59fb9d48bd2ab9e25 (commit) via addec41170dd57570eaf26d4620c8d742480d960 (commit) via 2332ec76e73aad423e575ca52b621bb1bb634b47 (commit) via 544cd04a90a45e4b8ba7caca531d103351e14948 (commit) via 6e96bae05598fc7601e9a50de75cf57271d984bb (commit) via af56d80f4475f1025b318facf6f26445243e4dc7 (commit) via 34a2082e68b24694d28598e14265b57a7b4a9769 (commit) via 3992e319fd854293724d884830571ed251c48496 (commit) via 717e7960c11d3d88ddfdd8c9f037331019b80cd9 (commit) via a227c3bff49a5d5bef2e2dfd55793b0cb9533461 (commit) via b2cd69dcec47ba9f374bc272990f935d7cb48ec9 (commit) via ebdb11132c65192efd1854300e54b3ba844d8c3d (commit) via 85b2eef569e6a253be79d0de697481fcc6a9acf2 (commit) via 2932c38b84d0c3c6af9fd166478d12c8d7f2515b (commit) via 8cf64375b9832e3300a7fdc3a1da570ee033d342 (commit) via a452ff839d2afa79c7bf56451ad544b9a4b37612 (commit) via dc86f0e542aaaf0f352a20b183465fb7eeb4d2e8 (commit) via 57e5390105f40c1ed9167520a7ade967f0833c60 (commit) via 108c1ea57996a286ff7046ec5e54a3a93e59007c (commit) via 7a706c27c1365e729a598e237209d544912aff9e (commit) via 59130016b7676ec89855e8a44b9d3c4f3e97839c (commit) via fb65c345976b2125f9b68d65ff3946c78b4cddd5 (commit) via 6631ca4a51d4b13d2edd2dc899f7b76c233825b5 (commit) via 12cf12f10c1c6adad568daf6c16144a99b0f822e (commit) via 96d43ea011c5e1008ea371951e6b9e9b63813c67 (commit) via 159568e7b8fe5021d924e459fc76717d468db057 (commit) via 85e3c288dfbcdad9ffb1f68c9bedd3dd1f6962ad (commit) via b1960eb8aa36b4c8d136f138392481a50a9475da (commit) via 6b0d6f90605e5940156fd614f9bb75c24bff (commit) via 947a727e5205780c3c4d32a3e161b47e67d448f0 (commit) via 750c7f565bdef64636fa6d414ca6d24e40f54536 (commit) via f56e4a993ab1ed6eed99c7c67b9de7c83ed6608a (commit) from 57930cf3e4eb79b26cd062b51635d1df2d68a0ed (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit aff7429440784c41666d978e2b74784f36f87d98 Author: Karolin Seeger Date: Fri Mar 6 09:00:58 2009 +0100 s3/WHATSNEW: Update changes since 3.3.0. Karolin (cherry picked from commit ca623a7aa45b93c76e4c03ef041fb518c330ca3f) commit 5afa5a02307635d71f54b6e59fb9d48bd2ab9e25 Author: Jeremy Allison Date: Thu Mar 5 21:51:00 2009 -0800 Get the sense of the integer wrap test the right way around. Sorry. Jeremy. (cherry picked from commit bbf72022b64a2ae207936f0208d3db2373a6d32b) commit addec41170dd57570eaf26d4620c8d742480d960 Author: Jeremy Allison Date: Thu Mar 5 21:04:52 2009 -0800 Now we're allowing a lower bound for auth_len, ensure we also check for an upper one (integer wrap). Jeremy. (cherry picked from commit acf2223f803c14c64a38f5218d823b8f8171e47f) commit 2332ec76e73aad423e575ca52b621bb1bb634b47 Author: Jeremy Allison Date: Thu Mar 5 17:17:52 2009 -0800 Fix bug #6161 - smbclient corrupts source path in tar mode This was my fault. I broke the smbclient tar argument processing in creating the string for chdir when removing pstrings. Jeremy. (cherry picked from commit a9e6c91cd18b8b7b805f4b69f3867ea4bd6bc3ba) commit 544cd04a90a45e4b8ba7caca531d103351e14948 Author: Jeremy Allison Date: Thu Mar 5 15:16:53 2009 -0800 Last part of fix for #6154 - zfs does not honor admin users. Jeremy. (cherry picked from commit ddaa1bae7567c81fb8e478c439bb970edab2f9c3) commit 6e96bae05598fc7601e9a50de75cf57271d984bb Author: Volker Lendecke Date: Thu Mar 5 22:20:55 2009 +0100 Complete the fix for bug 6100 According to [MS-RPCE].pdf, section 2.2.2.11: A client or a server that (during composing of a PDU) has allocated more space for the authentication token than the security provider fills in SHOULD fill in the rest of the allocated space with zero octets. These zero octets are still considered to belong to the authentication token part of the PDU.<36> RPC implementations are allowed to send padding bytes at the end of an auth footer. Windows 7 makes use of this. Thanks to Nick Meier Volker (cherry picked from commit 224364d6c9eaa4d07b57cdef04ac17acb416e413) commit af56d80f4475f1025b318facf6f26445243e4dc7 Author: Jeremy Allison Date: Thu Mar 5 09:03:48 2009 -0800 Fix bug #6160 - Office 2007 fails saving files to a Samba mapped drive. Confirmed by reporters. Jeremy. (cherry picked from commit 2cc696192fbc66b10fa6377d84cdebd23a045284) commit 34a2082e68b24694d28598e14265b57a7b4a9769 Author: Jeremy Allison Date: Wed Mar 4 17:18:12 2009 -0800 Second part of fix for #61
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5045-gca623a7
The branch, v3-3-test has been updated via ca623a7aa45b93c76e4c03ef041fb518c330ca3f (commit) from bbf72022b64a2ae207936f0208d3db2373a6d32b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit ca623a7aa45b93c76e4c03ef041fb518c330ca3f Author: Karolin Seeger Date: Fri Mar 6 09:00:58 2009 +0100 s3/WHATSNEW: Update changes since 3.3.0. Karolin --- Summary of changes: WHATSNEW.txt | 169 -- 1 files changed, 35 insertions(+), 134 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 141d76b..873c7bc 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,170 +1,71 @@ = - Release Notes for Samba 3.3.1 - February, 24 2009 + Release Notes for Samba 3.3.2 + March, 09 2009 = This is the latest bugfix release release of the Samba 3.3 series. -Major enhancements in Samba 3.3.1 include: +Major enhancements in Samba 3.3.2 include: - * Fix net ads join when "ldap ssl = start tls" (bug #6073). - * Fix renaming/deleting of files using Windows clients (bug #6082). - * Fix renaming/deleting a "not matching/resolving" symlink (bug #6090). - * Fix remotely adding a share via the Windows MMC. + * Fix "force group" (bug #6155). + * Fix guest authentication in setups with "security = share" and + "guest ok = yes" when Winbind is running. + * Fix corruptions of source path in tar mode of smbclient (bug #6161). ## Changes ### -smb.conf changes - -Parameter Name Description Default --- --- --- -ldap ssl ads New No - - -Changes since 3.3.0: +Changes since 3.3.1: o Jeremy Allison -* BUG 6082: Fix renaming/deleting of files using Windows clients. -* BUG 6069: Fix build with too many arguments. -* BUG 6090: Fix renaming/deleting a "not matching/resolving" symlink. -* BUG 6099: Try to fix domain join of Win7 Beta. -* BUG 6117: Fix core dump of pdbedit -a. -* BUG 6133: Fix deletion of non-ACL files on Solaris/ZFS/NFSv4 ACL - filesystem. -* Fix Coverity IDs 115, 116, 117, 602. -* Fix warning (bad handler prototype). -* Unify the detection of the timespec code in configure.in, and the - application of it in time.c. -* Correctly use chroot(). -* Parameterize in local.h the MAX_RPC_DATA_SIZE, and ensure that "offered" - read from the rpc packet in spoolss is under that size. -* Backport the semantics of when to delete alternate data streams on a file - truncate. -* Fix printf warnings. -* Fix warnings on Solaris. - - -o Michael Adam -* BUG 6066: netinet/ip.h present but cannot be compiled on Solaris. -* BUG 6073: Prevent ads_connect() from using SSL unless explicitly - requested. -* Fix 'getent passwd' to allocate new uids. -* Fix 'getent group' to allocate new gids. -* Remove check for sharename being a username in 'net conf - addshare'. - - -o Guenther Deschner -* Fix Coverity ID 848. -* Remove unused ENUM_HND from 'net'. -* Fix getform command asprintf return code in rpcclient. -* Fix memleak in get_remote_printer_publishing_data(). -* Remove duplicate prototypes for generated rpc server functions. - - -o Holger Hetterich -* Enable total anonymization in vfs_smb_traffic_analyzer. - - -o Bjoern Jacke -* Fix build with external dns_sd libraries. -* Fix configure check "sub-second timestamps without struct timespec". -* Add configure check for AIX style sub-second resolution support. -* Add configure check for Tru64 sub-second timestamp resolution. -* Add Tru64 sub-second resolution timestamp support. -* Enable IPv6 support for NetBSD and FreeBSD. -* Use correct BSD evironment variable. - - -o Guenter Kukkukk -* Don't try and delete a default ACL from a file. - - -o Volker Lendecke -* BUG 5798: CFLAGS info lost in configure. -* Fix Coverity IDs 740, 742, 744, 745, 876, 879, 880. -* Fix remotely adding a share via the Windows MMC. -* Avoid valgrind errors. -* Fix 'net rpc join' for users with the SeMachineAccountPrivilege. -* Fix resume handle for _samr_EnumDomainGroups. -* Fix a buffer handling bug when adding lots of registry keys. -* Fix a O(n^2) algorithm in regdb_fetch_keys(). - - -o Jeff Layton -* Initialize rc to 0 in main in mount.cifs. - - -o Derrell Lipman -* BUG
