Build status as of Thu Jan 7 07:00:03 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-01-06 00:00:04.0 -0700 +++ /home/build/master/cache/broken_results.txt 2010-01-07 00:00:26.0 -0700 @@ -1,22 +1,22 @@ -Build status as of Wed Jan 6 07:00:03 2010 +Build status as of Thu Jan 7 07:00:03 2010 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 1 0 0 +ccache 0 0 0 distcc 0 0 0 ldb 29 29 0 libreplace 0 0 0 lorikeet 0 0 0 pidl 0 0 0 ppp 0 0 0 -rsync29 12 0 +rsync1 0 0 samba-docs 0 0 0 samba-web0 0 0 samba_3_current 27 26 0 -samba_3_master 27 27 5 +samba_3_master 27 26 5 samba_3_next 27 27 2 -samba_4_0_test 29 26 3 -talloc 1 0 0 -tdb 1 0 0 +samba_4_0_test 29 26 2 +talloc 28 10 0 +tdb 26 17 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 71a40d7... s4/torture: fix small bug in lock test via 655bdb1... s4/torture: add more lock cancellation tests from f5729db... s3:lib/time: remove TIME_T_MIN/MAX defines http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 71a40d7e2c21bf3ac47be3ec57fb091ff420ba9a Author: Steven Danneman Date: Fri Dec 18 15:35:35 2009 -0800 s4/torture: fix small bug in lock test Cleanup path should unlock, not cancel existing locked range. commit 655bdb19bd91c43b2c5230927bfa8343a0c8a56a Author: Steven Danneman Date: Wed Dec 16 14:38:56 2009 -0800 s4/torture: add more lock cancellation tests * Test the SMB1 behavior when multiple lock ranges are requested, pend, and then are cancelled. The entire LockingAndX request fails. --- Summary of changes: source4/torture/raw/lock.c | 98 +++- 1 files changed, 96 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 34b05b7..7eb4610 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -643,10 +643,104 @@ static bool test_async(struct torture_context *tctx, /* cleanup the second lock */ io.lockx.in.ulock_cnt = 1; io.lockx.in.lock_cnt = 0; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = &lock[1]; + status = smb_raw_lock(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + /* If a lock request contained multiple ranges and we are cancelling +* one while it's still pending, what happens? */ + torture_comment(tctx, "testing cancel 1/2 lock request\n"); + + /* Send request with two ranges */ + io.lockx.in.timeout = -1; + io.lockx.in.ulock_cnt = 0; + io.lockx.in.lock_cnt = 2; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = lock; + req = smb_raw_lock_send(cli->tree, &io); + torture_assert(tctx,(req != NULL), talloc_asprintf(tctx, + "Failed to setup pending lock (%s)\n", __location__)); + + /* Try to cancel the first lock range */ + io.lockx.in.timeout = 0; + io.lockx.in.lock_cnt = 1; + io.lockx.in.mode = LOCKING_ANDX_CANCEL_LOCK | LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = &lock[0]; + status = smb_raw_lock(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + /* Locking request should've failed and second range should be +* unlocked */ + status = smbcli_request_simple_recv(req); + CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); + + io.lockx.in.timeout = 0; + io.lockx.in.ulock_cnt = 0; + io.lockx.in.lock_cnt = 1; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; io.lockx.in.locks = &lock[1]; status = smb_raw_lock(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_OK); + /* Cleanup both locks */ + io.lockx.in.ulock_cnt = 2; + io.lockx.in.lock_cnt = 0; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = lock; + status = smb_raw_lock(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + torture_comment(tctx, "testing cancel 2/2 lock request\n"); + + /* Lock second range so it contends */ + io.lockx.in.timeout = 0; + io.lockx.in.ulock_cnt = 0; + io.lockx.in.lock_cnt = 1; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = &lock[1]; + status = smb_raw_lock(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + /* Send request with two ranges */ + io.lockx.in.timeout = -1; + io.lockx.in.ulock_cnt = 0; + io.lockx.in.lock_cnt = 2; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = lock; + req = smb_raw_lock_send(cli->tree, &io); + torture_assert(tctx,(req != NULL), talloc_asprintf(tctx, + "Failed to setup pending lock (%s)\n", __location__)); + + /* Try to cancel the second lock range */ + io.lockx.in.timeout = 0; + io.lockx.in.lock_cnt = 1; + io.lockx.in.mode = LOCKING_ANDX_CANCEL_LOCK | LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = &lock[1]; + status = smb_raw_lock(cli->tree, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + /* Locking request should've failed and first range should be +* unlocked */ + status = smbcli_request_simple_recv(req); + CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); + + io.lockx.in.timeout = 0; + io.lockx.in.ulock_cnt = 0; + io.lockx.in.lock_cnt = 1; + io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; + io.lockx.in.locks = &lock[0]; + stat
[SCM] CTDB repository - branch 1.0.108 created - ctdb-1.0.108-4-gf24338e
The branch, 1.0.108 has been created at f24338e68c462e5cdee3194bb8f3ba18c3ca4672 (commit) - Log - commit f24338e68c462e5cdee3194bb8f3ba18c3ca4672 Author: Ronnie Sahlberg Date: Thu Jan 7 13:48:05 2010 +1100 version 1.0.108-3 commit 33da7bb109df5f5d4fe2719853718d0fff4842ca Author: Ronnie Sahlberg Date: Thu Jan 7 13:47:00 2010 +1100 From Volker: This fixes the following condition: On a cluster with many nodes a single node was running as the only node. Any transaction that was attempted against the persistent databases hung. From a former run of the cluster "__transaction_lock__" existed in the persistent databases, but with a dmaster entry in the ctdb header that was not the local node. When the transaction_start code tried to acquire this, ctdb queued the dmaster request to a node that does not exist, hanging forever. I though -- wait a second, why has nobody found this yet with non-persistent databases? Answer: Non-persistent databases are opened with CLEAR_IF_FIRST, which means that all records are locally deleted when ctdb attaches to it. This wipe does not happen for persistent databases, but we have this one __transaction_lock__ record around that is treated like a non-persistent database. This patch treats the __transaction_lock__ for persistent db's specially: It deletes it locally when ctdbd attaches to the db. commit b24075916f5b18c6c2e6dfc52ef4beacc315413b Author: Ronnie Sahlberg Date: Wed Jan 6 10:50:39 2010 +1100 version 1.0.108-2 commit 9d90a68b6995f0b7e1997b668cc980a81cf8114e Author: Ronnie Sahlberg Date: Wed Jan 6 10:42:41 2010 +1100 use --ping instead of --ping-dc for winbind for now --- -- CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f5729db... s3:lib/time: remove TIME_T_MIN/MAX defines via 571ee54... lib/util: move TIME_T_MIN/MAX defines into header file via b3e065e... Ñ3:lib/time: replace make_dos_ and put_dos_ functions with those from lib/util/ via c5f24c3... s3:lib/time: remoce null_mtime() - use null_time() via c1c7b6c... s3:lib/time: remove unused nt_time_equals from d5995ee... Second part of the fix for bug #7020 - smbd using 2G memory. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f5729dbb6e720cb6076ea053f1ad0680259e6b39 Author: Björn Jacke Date: Thu Jan 7 00:41:50 2010 +0100 s3:lib/time: remove TIME_T_MIN/MAX defines we already get them from lib/util/time.h commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8 Author: Björn Jacke Date: Thu Jan 7 00:40:09 2010 +0100 lib/util: move TIME_T_MIN/MAX defines into header file commit b3e065e0c672426a473d13c14f43f557c98d9909 Author: Björn Jacke Date: Wed Jan 6 23:24:48 2010 +0100 Ñ3:lib/time: replace make_dos_ and put_dos_ functions with those from lib/util/ commit c5f24c3eacf8892270702eeb0e1e037a0a1b4dde Author: Björn Jacke Date: Wed Jan 6 21:32:35 2010 +0100 s3:lib/time: remoce null_mtime() - use null_time() commit c1c7b6cecb848c35c2cead332483ce117552d6bc Author: Björn Jacke Date: Wed Jan 6 19:31:41 2010 +0100 s3:lib/time: remove unused nt_time_equals we have nt_time_equal doing the same in lib/util/ --- Summary of changes: lib/util/time.c | 14 - lib/util/time.h | 14 + source3/include/proto.h |2 - source3/lib/time.c | 124 +++ 4 files changed, 21 insertions(+), 133 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/time.c b/lib/util/time.c index eadafe4..571219b 100644 --- a/lib/util/time.c +++ b/lib/util/time.c @@ -27,11 +27,6 @@ * @brief time handling functions */ -#ifndef TIME_T_MIN -/* we use 0 here, because (time_t)-1 means error */ -#define TIME_T_MIN 0 -#endif - #if (SIZEOF_LONG == 8) #define TIME_FIXUP_CONSTANT_INT 11644473600L #elif (SIZEOF_LONG_LONG == 8) @@ -40,15 +35,6 @@ -/* - * we use the INT32_MAX here as on 64 bit systems, - * gmtime() fails with INT64_MAX - */ - -#ifndef TIME_T_MAX -#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t)) -#endif - /** External access to time_t_min and time_t_max. **/ diff --git a/lib/util/time.h b/lib/util/time.h index e40de2d..cf6dc1c 100644 --- a/lib/util/time.h +++ b/lib/util/time.h @@ -23,6 +23,20 @@ #define _PUBLIC_ #endif +#ifndef TIME_T_MIN +/* we use 0 here, because (time_t)-1 means error */ +#define TIME_T_MIN 0 +#endif + +/* + * we use the INT32_MAX here as on 64 bit systems, + * gmtime() fails with INT64_MAX + */ +#ifndef TIME_T_MAX +#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t)) +#endif + + /* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */ typedef uint64_t NTTIME; diff --git a/source3/include/proto.h b/source3/include/proto.h index d956ede..5b16120 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1059,14 +1059,12 @@ void cli_put_dos_date3(struct cli_state *cli, char *buf, int offset, time_t unix time_t cli_make_unix_date(struct cli_state *cli, const void *date_ptr); time_t cli_make_unix_date2(struct cli_state *cli, const void *date_ptr); time_t cli_make_unix_date3(struct cli_state *cli, const void *date_ptr); -bool nt_time_equals(const NTTIME *nt1, const NTTIME *nt2); void TimeInit(void); void get_process_uptime(struct timeval *ret_time); time_t nt_time_to_unix_abs(const NTTIME *nt); time_t uint64s_nt_time_to_unix_abs(const uint64_t *src); void unix_timespec_to_nt_time(NTTIME *nt, struct timespec ts); void unix_to_nt_time_abs(NTTIME *nt, time_t t); -bool null_mtime(time_t mtime); const char *time_to_asc(const time_t t); const char *display_time(NTTIME nttime); bool nt_time_is_set(const NTTIME *nt); diff --git a/source3/lib/time.c b/source3/lib/time.c index a418c42..5286af3 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -28,14 +28,6 @@ */ -#ifndef TIME_T_MIN -#define TIME_T_MIN ((time_t)0 < (time_t) -1 ? (time_t) 0 \ - : ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1)) -#endif -#ifndef TIME_T_MAX -#define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN) -#endif - #define NTTIME_INFINITY (NTTIME)0x8000LL #if (SIZEOF_LONG == 8) @@ -44,53 +36,6 @@ #define TIME_FIXUP_CONSTANT_INT 11644473600LL #endif -/*** - create a 16 bit dos packed date -/ -static uint16_t make_dos_date1(struct tm *t) -{ - uint16_t ret=0; - ret
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 0660945... s4-smbtorture: add test_ChangeID to RPC-SPOOLSS. via d737565... s4-smbtorture: add test_SetPrinter to RPC-SPOOLSS. via d5eac5b... s4-smbtorture: refactor test_GetPrinter in RPC-SPOOLSS. via f5af157... s3-net: use generated krb5.conf in 'net ads testjoin' via 79f92a1... s3-docs: mention -M option and remove nonexisting -G option in pdbedit manpage. from 80b5f95... Second part of the fix for bug #7020 - smbd using 2G memory. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 066094537420c70e453462407c751c9ae863ae01 Author: Günther Deschner Date: Wed Jan 6 19:34:33 2010 +0100 s4-smbtorture: add test_ChangeID to RPC-SPOOLSS. This tests ChangeID consistency between spoolss_GetPrinterData, spoolss_GetPrinterDataEx and spoolss_GetPrinter (level 0). Guenther (cherry picked from commit 3dbe8603d967d9d1b13290ec0f0556c7323a7692) commit d7375656d058cef1a47158132eb0599becb1a779 Author: Günther Deschner Date: Wed Jan 6 19:33:39 2010 +0100 s4-smbtorture: add test_SetPrinter to RPC-SPOOLSS. Guenther (cherry picked from commit 7568f49134c548c470e99c51e237ad3e225d6488) commit d5eac5b8dccd2d940044c3d06603554740dd3ac3 Author: Günther Deschner Date: Wed Jan 6 17:51:34 2010 +0100 s4-smbtorture: refactor test_GetPrinter in RPC-SPOOLSS. Guenther (cherry picked from commit 0457cf915b724e3afd54ab1b5c8b96dcb5b7550a) commit f5af157fc004d210e9740491fcce84bbd1b1ebfa Author: Günther Deschner Date: Wed Dec 16 21:22:50 2009 +0100 s3-net: use generated krb5.conf in 'net ads testjoin' Guenther (cherry picked from commit 475d296065d57f9b38b109203b40ed0b47a2ac7e) commit 79f92a10a8a25c0f162b0b4707e90f9ab01b540f Author: Günther Deschner Date: Wed Dec 23 10:33:13 2009 +0100 s3-docs: mention -M option and remove nonexisting -G option in pdbedit manpage. Guenther (cherry picked from commit 3b40ec83705f7ea61f4d4b88438493b6c197f222) --- Summary of changes: docs-xml/manpages-3/pdbedit.8.xml | 10 +- source3/utils/net_ads.c |4 + source4/torture/rpc/spoolss.c | 283 + 3 files changed, 264 insertions(+), 33 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml index dbce28f..eaafb97 100644 --- a/docs-xml/manpages-3/pdbedit.8.xml +++ b/docs-xml/manpages-3/pdbedit.8.xml @@ -29,12 +29,12 @@ -f fullname --force-initialized-passwords -g - -G SID|RID -h homedir -i passdb-backend -I domain -L -m + -M SID|RID -N description -P account-policy -p profile @@ -215,13 +215,13 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: - -G|'--group SID' SID|rid + -M|'--machine SID' SID|rid - This option can be used while adding or modifying a user account. It - will specify the users' new primary group SID (Security Identifier) or + This option can be used while adding or modifying a machine account. It + will specify the machines' new primary group SID (Security Identifier) or rid. - Example: -G S-1-5-21-2447931902-1787058256-3961074038-1201 + Example: -M S-1-5-21-2447931902-1787058256-3961074038-1201 diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index f133eec..8e644bb 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1007,6 +1007,8 @@ static NTSTATUS net_ads_join_ok(struct net_context *c) { ADS_STRUCT *ads = NULL; ADS_STATUS status; + fstring dc_name; + struct sockaddr_storage dcip; if (!secrets_init()) { DEBUG(1,("Failed to initialise secrets database\n")); @@ -1015,6 +1017,8 @@ static NTSTATUS net_ads_join_ok(struct net_context *c) net_use_krb_machine_account(c); + get_dc_name(lp_workgroup(), lp_realm(), dc_name, &dcip); + status = ads_startup(c, true, &ads); if (!ADS_ERR_OK(status)) { return ads_ntstatus(status); diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 65bc361..489174b 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -5,7 +5,7 @@ Copyright (C) Tim Potter 2003 Copyright (C) Stefan Metzmacher 2005 Copyright (C) Jelmer Vernooij 2007 - Copyright (C) Guenther Deschner 2009 + Copyright (C) Guenther Deschner
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 80b5f95... Second part of the fix for bug #7020 - smbd using 2G memory. from b635398... Fix bug #7020 - smbd using 2G memory. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 80b5f95b7d05955943c33968b4f0742581b00480 Author: Jeremy Allison Date: Wed Jan 6 13:11:00 2010 -0800 Second part of the fix for bug #7020 - smbd using 2G memory. There was a second leak in the processing of the out_data.frag prs_struct. It needs freeing once the current pdu has been returned asynchronously. Jeremy. (cherry picked from commit d5995eec7e5fd487b57b8805095ffbc74796411a) --- Summary of changes: source3/rpc_server/srv_pipe_hnd.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index 5d5eb0e..83f27fe 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -903,6 +903,13 @@ static ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_ out: (*is_data_outstanding) = prs_offset(&p->out_data.frag) > n; + if (p->out_data.current_pdu_sent == prs_offset(&p->out_data.frag)) { + /* We've returned everything in the out_data.frag +* so we're done with this pdu. Free it and reset +* current_pdu_sent. */ + p->out_data.current_pdu_sent = 0; + prs_mem_free(&p->out_data.frag); + } return data_returned; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d5995ee... Second part of the fix for bug #7020 - smbd using 2G memory. from 3dbe860... s4-smbtorture: add test_ChangeID to RPC-SPOOLSS. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d5995eec7e5fd487b57b8805095ffbc74796411a Author: Jeremy Allison Date: Wed Jan 6 13:11:00 2010 -0800 Second part of the fix for bug #7020 - smbd using 2G memory. There was a second leak in the processing of the out_data.frag prs_struct. It needs freeing once the current pdu has been returned asynchronously. Jeremy. --- Summary of changes: source3/rpc_server/srv_pipe_hnd.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index 5d5eb0e..83f27fe 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -903,6 +903,13 @@ static ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_ out: (*is_data_outstanding) = prs_offset(&p->out_data.frag) > n; + if (p->out_data.current_pdu_sent == prs_offset(&p->out_data.frag)) { + /* We've returned everything in the out_data.frag +* so we're done with this pdu. Free it and reset +* current_pdu_sent. */ + p->out_data.current_pdu_sent = 0; + prs_mem_free(&p->out_data.frag); + } return data_returned; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3dbe860... s4-smbtorture: add test_ChangeID to RPC-SPOOLSS. via 7568f49... s4-smbtorture: add test_SetPrinter to RPC-SPOOLSS. via 0457cf9... s4-smbtorture: refactor test_GetPrinter in RPC-SPOOLSS. from e172b21... Ñ3:configure: use gettimeofday check from lib/util/ http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3dbe8603d967d9d1b13290ec0f0556c7323a7692 Author: Günther Deschner Date: Wed Jan 6 19:34:33 2010 +0100 s4-smbtorture: add test_ChangeID to RPC-SPOOLSS. This tests ChangeID consistency between spoolss_GetPrinterData, spoolss_GetPrinterDataEx and spoolss_GetPrinter (level 0). Guenther commit 7568f49134c548c470e99c51e237ad3e225d6488 Author: Günther Deschner Date: Wed Jan 6 19:33:39 2010 +0100 s4-smbtorture: add test_SetPrinter to RPC-SPOOLSS. Guenther commit 0457cf915b724e3afd54ab1b5c8b96dcb5b7550a Author: Günther Deschner Date: Wed Jan 6 17:51:34 2010 +0100 s4-smbtorture: refactor test_GetPrinter in RPC-SPOOLSS. Guenther --- Summary of changes: source4/torture/rpc/spoolss.c | 283 + 1 files changed, 255 insertions(+), 28 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 65bc361..489174b 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -5,7 +5,7 @@ Copyright (C) Tim Potter 2003 Copyright (C) Stefan Metzmacher 2005 Copyright (C) Jelmer Vernooij 2007 - Copyright (C) Guenther Deschner 2009 + Copyright (C) Guenther Deschner 2009-2010 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -865,45 +865,67 @@ static bool test_GetPrinterDriver2(struct torture_context *tctx, struct policy_handle *handle, const char *driver_name); -static bool test_GetPrinter(struct torture_context *tctx, - struct dcerpc_pipe *p, -struct policy_handle *handle) +static bool test_GetPrinter_level(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *handle, + uint32_t level, + union spoolss_PrinterInfo *info) { - NTSTATUS status; struct spoolss_GetPrinter r; - uint16_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; - int i; uint32_t needed; - for (i=0;ilp_ctx), needed, 4); - torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed"); + if (info && r.out.info) { + *info = *r.out.info; + } + + return true; +} + + +static bool test_GetPrinter(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *handle) +{ + uint32_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; + int i; + + for (i=0;ilp_ctx), needed, 4); + union spoolss_PrinterInfo info; - if ((r.in.level == 2) && r.out.info->info2.drivername && strlen(r.out.info->info2.drivername)) { + ZERO_STRUCT(info); + + torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, levels[i], &info), + "failed to call GetPrinter"); + + if ((levels[i] == 2) && info.info2.drivername && strlen(info.info2.drivername)) { torture_assert(tctx, - test_GetPrinterDriver2(tctx, p, handle, r.out.info->info2.drivername), + test_GetPrinterDriver2(tctx, p, handle, info.info2.drivername), "failed to call test_GetPrinterDriver2"); } } @@ -911,6 +933,32 @@ static bool test_GetPrinter(struct torture_context *tctx, return true; } +static bool test_SetPrinter(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *handle, + struct spoolss_SetPrinterInfoCtr *info_ctr, + struct spoolss_DevmodeContainer *devmode_ctr, + struct sec_desc_buf *secdesc_ctr, + enum spoolss_PrinterControl command) +{ + struct spoolss_SetPrinter r; + + r.in.handle = handle; + r.in.info_ctr = info_ctr; + r.in.devmode_ctr = devmode_ctr; + r.in.secdesc_ctr = secdesc_ctr; + r.in.command = command; + + torture_comment(tctx, "Testing SetPrinter Level %d\n", r.in.info_ctr->level); + +
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.2-ctdb-16-2-g68747f4
The branch, v3-4-ctdb has been updated via 68747f49c7338a905ed9beac6300b20c0a8a064e (commit) from b130fa9d595893621c8f5b9088f4e123bc9644c5 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb - Log - commit 68747f49c7338a905ed9beac6300b20c0a8a064e Author: Michael Adam Date: Wed Jan 6 00:37:21 2010 +0100 s3:dbwrap_ctdb: fix logic error in pull_newest_from_marshall_buffer(). The logic bug was that if a record was found in the marshall buffer, then always the ctdb header of tha last record in the marshall buffer was returned, and not the ctdb header of the last occurrence of the requested record. This is fixed by introducing an additional temporary variable. Michael --- Summary of changes: source3/lib/dbwrap_ctdb.c |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index d6fde35..4e97d26 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -403,8 +403,11 @@ static bool pull_newest_from_marshall_buffer(struct ctdb_marshall_buffer *buf, for (i=0; icount; i++) { TDB_DATA tkey, tdata; uint32_t reqid; + struct ctdb_ltdb_header hdr; - rec = db_ctdb_marshall_loop_next(buf, rec, &reqid, &h, &tkey, + ZERO_STRUCT(hdr); + + rec = db_ctdb_marshall_loop_next(buf, rec, &reqid, &hdr, &tkey, &tdata); if (rec == NULL) { return false; @@ -413,6 +416,7 @@ static bool pull_newest_from_marshall_buffer(struct ctdb_marshall_buffer *buf, if (tdb_data_equal(key, tkey)) { found = true; data = tdata; + h = hdr; } } -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e172b21... Ñ3:configure: use gettimeofday check from lib/util/ via 350db0b... vfs_commit: print warning when no fsync support is there from c01f443... tdb: fix standalone 'make installdocs' http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e172b219eec72e978b3c754c4767e999b184c0ed Author: Björn Jacke Date: Wed Jan 6 15:32:15 2010 +0100 Ñ3:configure: use gettimeofday check from lib/util/ commit 350db0bf2548bd670ebff4587580ba9ca9212ac8 Author: Björn Jacke Date: Sun Dec 13 21:56:28 2009 +0100 vfs_commit: print warning when no fsync support is there this one was part of an old patch from jpeach. --- Summary of changes: source3/configure.in | 10 +- source3/modules/vfs_commit.c |2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 7d34237..e3f53b4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -120,6 +120,7 @@ fi m4_include(../lib/socket_wrapper/config.m4) m4_include(../lib/nss_wrapper/config.m4) +m4_include(../lib/util/time.m4) m4_include(m4/swat.m4) @@ -2216,15 +2217,6 @@ if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro]) fi -AC_CACHE_CHECK([if gettimeofday takes tz argument],samba_cv_HAVE_GETTIMEOFDAY_TZ,[ -AC_TRY_LINK([ -#include -#include ], [struct timeval tv; return gettimeofday(&tv, NULL);], - samba_cv_HAVE_GETTIMEOFDAY_TZ=yes, - samba_cv_HAVE_GETTIMEOFDAY_TZ=no)]) -if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then -AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday takes a tz argument]) -fi if test x"$samba_cv_WITH_PROFILE" = x"yes"; then diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c index 1d09949..cade117 100644 --- a/source3/modules/vfs_commit.c +++ b/source3/modules/vfs_commit.c @@ -88,6 +88,8 @@ static int commit_do( #elif HAVE_FSYNC result = fsync(fd); #else + DEBUG(0, ("%s: WARNING: no commit support on this platform\n", + MODULE)); result = 0 #endif if (result == 0) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c01f443... tdb: fix standalone 'make installdocs' via 0a3a6bb... tdb: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details via eff6022... talloc: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details via f408d58... tevent: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details from a2044b9... s4: Fix result check for getaddrinfo() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c01f443ebca5e0b6f65fe8b3ab031da51dce2e89 Author: Stefan Metzmacher Date: Wed Jan 6 14:39:43 2010 +0100 tdb: fix standalone 'make installdocs' metze commit 0a3a6bb8f910df02cb429fdeacf0ab8d683e0b89 Author: Brian Lu Date: Thu Dec 17 14:39:09 2009 +0800 tdb: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details Signed-off-by: Stefan Metzmacher commit eff6022d51f578dfc48f1d66dd8ec1e860dfd7b3 Author: Brian Lu Date: Thu Dec 17 14:48:59 2009 +0800 talloc: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details Signed-off-by: Stefan Metzmacher commit f408d58d95f5ac10849742fdcdf7e6160196e8e0 Author: Brian Lu Date: Thu Dec 17 14:55:57 2009 +0800 tevent: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details Signed-off-by: Stefan Metzmacher --- Summary of changes: lib/talloc/talloc.mk |5 + lib/tdb/Makefile.in |1 + lib/tdb/tdb.mk | 10 +++--- lib/tevent/tevent.mk |4 4 files changed, 17 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk index a563d61..fc90f4d 100644 --- a/lib/talloc/talloc.mk +++ b/lib/talloc/talloc.mk @@ -1,5 +1,6 @@ TALLOC_OBJ = $(tallocdir)/talloc.o +TALLOC_SHLIB = libtalloc.$(SHLIBEXT) TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION) TALLOC_SONAME = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION_MAJOR) TALLOC_STLIB = libtalloc.a @@ -25,6 +26,10 @@ install:: all if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true + rm -f $(DESTDIR)$(libdir)/$(TALLOC_SONAME) + ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SONAME) + rm -f $(DESTDIR)$(libdir)/$(TALLOC_SHLIB) + ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SHLIB) doc:: talloc.3 talloc.3.html diff --git a/lib/tdb/Makefile.in b/lib/tdb/Makefile.in index 3abeec3..dc22ee3 100644 --- a/lib/tdb/Makefile.in +++ b/lib/tdb/Makefile.in @@ -9,6 +9,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ +mandir = @mandir@ VPATH = @srcdir@:@libreplacedir@ srcdir = @srcdir@ builddir = @builddir@ diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk index 93aa899..ecc6f9f 100644 --- a/lib/tdb/tdb.mk +++ b/lib/tdb/tdb.mk @@ -61,9 +61,9 @@ doc:: manpages/tdbbackup.8 manpages/tdbdump.8 manpages/tdbtool.8 -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< installdocs:: - ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1 - for I in manpages/*.1; do \ - ${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man1 \ + ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man8 + for I in manpages/*.8; do \ + ${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man8; \ done install-python:: build-python @@ -91,6 +91,10 @@ installheaders:: installdirs installlibs:: all installdirs cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir) + rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) + ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) + rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) + ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) $(TDB_STLIB): $(TDB_OBJ) ar -rv $(TDB_STLIB) $(TDB_OBJ) diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk index 694d082..57bfd81 100644 --- a/lib/tevent/tevent.mk +++ b/lib/tevent/tevent.mk @@ -26,6 +26,10 @@ installheaders:: installdirs installlibs:: installdirs cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir) + rm -f $(DESTDIR)$(libdir)/$(TEVENT_SONAME) + ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SONAME) + rm -f $(DESTDIR)$(libdir)/$(TEVENT_SOBASE) + ln -s $(TEVENT_
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a2044b9... s4: Fix result check for getaddrinfo() from f6bd654... Fix bug #7020 - smbd using 2G memory. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a2044b9a61d9c8ca66067b286ad9bc01cf0490b9 Author: Kamen Mazdrashki Date: Wed Jan 6 13:40:33 2010 +0200 s4: Fix result check for getaddrinfo() I think this completes commit 50feca550eed7828198b7c0fc5f0e5ddc863313d. Now result should be handled correctly both for systems that support EAI_NODATA but returns EAI_NONAME (as my Ubuntu 9.x) and systems that doesn't support EAI_NODATA at all. Signed-off-by: Stefan Metzmacher --- Summary of changes: source4/libcli/resolve/dns_ex.c | 17 +++-- 1 files changed, 11 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c index 1b50372..79ed783 100644 --- a/source4/libcli/resolve/dns_ex.c +++ b/source4/libcli/resolve/dns_ex.c @@ -283,14 +283,19 @@ static void run_child_getaddrinfo(struct dns_ex_state *state, int fd) hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV; ret = getaddrinfo(state->name.name, "0", &hints, &res_list); + /* try to fallback in case of error */ + if (state->do_fallback) { + switch (ret) { #ifdef EAI_NODATA - if (ret == EAI_NODATA && state->do_fallback) { -#else - if (ret == EAI_NONAME && state->do_fallback) { + case EAI_NODATA: #endif - /* getaddrinfo() doesn't handle CNAME records */ - run_child_dns_lookup(state, fd); - return; + case EAI_NONAME: + /* getaddrinfo() doesn't handle CNAME records */ + run_child_dns_lookup(state, fd); + return; + default: + break; + } } if (ret != 0) { goto done; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via 4e8c70e... Fix bug #7020 - smbd using 2G memory. via 02c9d04... s3: List trusted domains from wcache when domain is offline. via a246c49... s3: Make winbindd_cache.c aware of domain offline to avoid unnecessary backend query. via 2764612... s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response. via f5e81c5... s3 net: Fix up a share type translation and translate some more strings (cherry picked from commit da41f23bdad1ea3a1a49110217cfde3efcde5075) (cherry picked from commit 0272f44061fa9205bb744e286b6203e15e157a6e) via b9d00a6... s3 net: Add a few missing gettext calls. via a63b54a... net: Add some German translation from ea57f91... VERSION: Raise version number up to 3.5.0rc1. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit 4e8c70e288f15cdd55f40b0ab6e8beee180b4751 Author: Jeremy Allison Date: Tue Jan 5 14:34:00 2010 -0800 Fix bug #7020 - smbd using 2G memory. When deferring an async pipe writeX and readX transfer the outstanding request struct onto the conn struct. This needs freeing after the packet is finally processed. Jeremy. (cherry picked from commit f6bd654a6c878111f0f0f4d07adb644fc3bbf224) (cherry picked from commit b63539809d022f7012f4899a5a18a835079d6c6f) commit 02c9d04b9e2c42635f3c82fd2b5f5ebf0a1d2d8e Author: Bo Yang Date: Wed Jan 6 19:13:59 2010 +0800 s3: List trusted domains from wcache when domain is offline. Signed-off-by: Bo Yang (cherry picked from commit d06fb8e02706559e91c6d185427409bb093bb896) (cherry picked from commit 65003db3685098dd3b8370c5a6fc673c9eba5d7a) commit a246c49e80420f3dcc8893b8b48a90a6db3f8b16 Author: Bo Yang Date: Wed Jan 6 15:05:20 2010 +0800 s3: Make winbindd_cache.c aware of domain offline to avoid unnecessary backend query. Signed-off-by: Bo Yang (cherry picked from commit 133638c8aea7280d01b5a23150428977e9ff0e11) (cherry picked from commit 063a2ceb9192a5b1820a7e115decc49357f2b3b6) commit 2764612487697e2e35bede3dbf4f41c1fea0e9c7 Author: Bo Yang Date: Wed Jan 6 12:13:35 2010 +0800 s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response. Signed-off-by: Bo Yang (cherry picked from commit 36493bf2f6634b84c57107bcb86bcbf3e82e80fc) (cherry picked from commit b58b359881c91ec382cfa1d6ba3007b8354b29cb) commit f5e81c55a768027fc9fb72122a54913b0e5f8a2d Author: Kai Blin Date: Tue Jan 5 09:54:04 2010 +0100 s3 net: Fix up a share type translation and translate some more strings (cherry picked from commit da41f23bdad1ea3a1a49110217cfde3efcde5075) (cherry picked from commit 0272f44061fa9205bb744e286b6203e15e157a6e) commit b9d00a64d2f71a2b268ffdff4c8c918f44f8a749 Author: Kai Blin Date: Tue Jan 5 09:43:34 2010 +0100 s3 net: Add a few missing gettext calls. Many many thanks to Adi Roiban from #ubuntu-translators for helping me find and fix my problems with the translations. (cherry picked from commit 9a9d737070bfde62f2d5a35ad25606da578f9f7e) (cherry picked from commit dda309191e8927ffcea8724db1a65c422f90e6b9) commit a63b54a541c97d52c4f715f54415bf8695b6dd9f Author: André Hentschel Date: Mon Dec 28 02:58:40 2009 +0100 net: Add some German translation Signed-off-by: Kai Blin (cherry picked from commit b0dd364cdde107577c74a91f3a65989e97a2c073) (cherry picked from commit ba2cc29fe0ebd4282ddd19026759bae2c93c) --- Summary of changes: source3/include/proto.h |5 + source3/locale/net/de.po| 2070 --- source3/rpc_client/cli_pipe.c | 26 +- source3/rpc_client/ndr.c| 15 + source3/rpc_client/rpc_transport_np.c | 12 + source3/rpc_client/rpc_transport_smbd.c | 10 + source3/rpc_client/rpc_transport_sock.c | 53 + source3/smbd/pipes.c| 10 + source3/utils/net_help.c|4 +- source3/utils/net_util.c|8 +- source3/winbindd/winbindd_cache.c | 380 ++- source3/winbindd/winbindd_cm.c |3 +- source3/winbindd/winbindd_rpc.c | 14 +- 13 files changed, 1603 insertions(+), 1007 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index d2ebd92..b3512d9 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5377,6 +5377,7 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *me