[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 427805b samba-tool: ensure prompting of passwords is in the right order via 2b6ea79 samba-tool: Added gpo fetch command implementation using python smb module. via d6db661 samba-tool: Change samba-tool gpo semantics (use gpo name instead of dn) via 43ff229 s4-libcli: Initialize stack structure variables to zero. via 6c1cbfb tests-blackbox: Revert the test to use user-level change password command via fca7062 test-blackbox: use python version of change password command via db151ee test-blackbox: Rearrange arguments for samba-tool user setpassword command via c876993 test-blackbox: Remove 'domain\' from username for samba-tool user setpassword via 94976ee test-blackbox: Rearrange the arguments in required order for samba-tool time via 9e7d8ed samba-tool: Add user password command to change user's own password via 9c37084 s4-libnet: py_net Add change_password() python command via 05ff244 s4-libnet: py_net - Remove parsing for credentials argument via d885280 samba-tool: Python routine to find writable/ldap-capable DC via 20f8a8e s4-libcli: Added python interface for file I/O using SMB via c2853e0 samba-tool: For samba-tool-c, help lists commands implemented only in C via 921424f s4-param: Fix object names for python objects PyLoadparm and PyLoadparmContext via 48d905f samba-tool: Catch exceptions at top-level and exit with correct return value via e79040c samba-tool: Display usage for main commands and list them alphabetically via 1a44400 samba-tool: Raise exception on errors and report using base class via d4c1149 samba-tool: Display Usage line and list commands alphabetically via 02667cb samba-tool: Replace C version of samba-tool with python version via 35747fe samba-tool: Added python version of samba-tool via 2625199 s4auth: Fix the object name for Py_Security via 6a12f7d s4auth: Fix the object names for PyCredentials and PyCredentialCacheContainer via b9e0587 s4auth: Remove duplicate assignment of structure variable via ef5e9ec ldb-samba: Allow --show-binary flag on defaultSecurityDescriptor via 197996c ldb: Expose ldb_handler_fold() funcion via e746610 samba-tool: Reimplement GPO functions in python via 8de3f98 samba-tool: Removed newuser via 901959d samba-tool: updated test suite to account for newuser change via 31ade9c samba-tool: Changed user add implementation via 41f073e samba-tool: add -H or --URL where necessary via 2e08285 samba-tool: update test suite to reflect the move from password to user setpassword via cdf8926 samba-tool: Remove password as it has been moved to user setpassword via 356a2cc s3-waf: the passdb subsystem needs to be called pdb from d82256c Use existing ISDOT and ISDOTDOT macros. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 427805b87a0781a4b39594f4efdf4b9d023d2324 Author: Andrew Tridgell tri...@samba.org Date: Thu Jul 28 15:14:03 2011 +1000 samba-tool: ensure prompting of passwords is in the right order ask the creds object for the password before prompting for the new password in the user password change code, to ensure the user is asked for the old password first Pair-Programmed-With: Amitay Isaacs ami...@gmail.com Pair-Programmed-With: Andrew Bartlett abart...@samba.org Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Thu Jul 28 08:35:45 CEST 2011 on sn-devel-104 commit 2b6ea7975b5254a90ea183e3a69647920cbf4595 Author: Amitay Isaacs ami...@gmail.com Date: Thu Jul 28 14:17:19 2011 +1000 samba-tool: Added gpo fetch command implementation using python smb module. To copy the GPO files, use libcli python interface list() to get directory listing and loadfile() to read the contents of the file. Signed-off-by: Andrew Tridgell tri...@samba.org commit d6db6614dd3621ad2a2cff58d1d79d6fdf7345f0 Author: Amitay Isaacs ami...@gmail.com Date: Thu Jul 28 14:07:44 2011 +1000 samba-tool: Change samba-tool gpo semantics (use gpo name instead of dn) Instead of using gpo dn as the key to refer to a gpo, use the gpo name as the key. If no URL is specified (-H option), find a writable DC and use that. Extract a commonly used method as get_gpo_info() to find details of a GPO. Signed-off-by: Andrew Tridgell tri...@samba.org commit 43ff229b9a71959c2a583d1ff6bec3de5d873af3 Author: Amitay Isaacs ami...@gmail.com Date: Thu Jul 28 13:22:01 2011 +1000 s4-libcli: Initialize stack structure variables to zero. Update do_smb_connect function to return NTSTATUS rather than raise python exception on error. Error
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0ad8c12 s3:modules:nfs4_acls: improve fix for bug #8330 via 7b7c6c8 s3:torture: use lp_load_global() in pdbtest - this does not need shares nor IPC$ via a6fe4d2 s3:winbindd: use lp_load_global() - winbindd does not need shares or IPC$ via b793e02 s3:smbstatus: use lp_load_global() - smbstatus does not need to load shares! via 7c41dda s3:split_tokens: use lp_load_global(), fixing the call to lp_load() via d696bee s3:split_tokens: fix a nonempty blank line via d29be7d s3: use lp_load_global() in smbw_sample -- whatever this is ... :-) via b9fdfba s3:smbtree: use lp_load_global() via 7e2deb9 s3:smbpasswd: use lp_load_global() via 039ae12 s3:smbfilter: use lp_load_global() via e6176d5 s3:smbcquotas: use lp_load_global() via ce8beb5 s3:smbcontrol: use lp_load_global(): smbcontrol does not need to load the shares via b608cfc s3:smbcacls: use lp_load_global() via d4abfcc s3:pdbedit: use lp_load_global() via 2a98ee0 s3:ntlm_auth: use lp_load_global() via ac9a61b s3:nmblookup: use lp_load_global() via 82202f9 s3:net: use lp_load_global() via 7557ba1 s3:eventlogadm: use lp_load_global() via 1679fe5 s3:dbwrap_torture: use lp_load_global() via 59a2f3d s3:dbwrap_tool: use lp_load_global() via ae752ec s3:smbtorture: use the lp_load_global() wrapper of lp_load() via c32479f s3:torture: use lp_load_global() in the strstr test via ecc487e s3:torture: use lp_load_global in the strcmp test via 426ae35 s3:torture: use lp_load_global() in the push_ucs2 test via bfde6fa s3:torture: use lp_load_global() in the msgtest via d6b4c69 s3:torture: use lp_load_global() in the masktest via ee495ab s3:torture: use lp_load_global() in locktest2 via 407a514 s3:torture: use lp_load_global() in the locktest via 4a21e50 s3:rpcclient: use the lp_load_global() wrapper of lp_load() via a7e9219 s3:nmbd: use the lp_load_global() wrapper of lp_load() via 74b806c s3:libnet_join: use lp_load_global() wrapper of lp_load() via 88ee697 s3:libsmbconf: use lp_load_global() in the testsuite via 2c3a1f4 s3:libnetapi: use lp_load_global() via c2aa8e5 s3:loadparm: make lp_set_in_client() static - only used in wrappers in loadparm now. via c9efe30 s3:pam_smbpass: use lp_load_client() in pam_smbpass via f764de6 s3:libsmb: use lp_load_client() and lp_load_client_no_reinit() in libsmb_context via 4e41d38 s3:loadparm: add wrapper lp_load_client_no_reinit() via 5676fbb s3:loadparm: add wrapper lp_load_globals_no_reinit() via fbf254c s3:libsmb: fix a call to lp_load to reinit the globals in any case via bff217c s3:smbspool: use lp_load_client() via 0c55a76 s3:smbclient: use lp_load_client() via 0b21c77 s3:loadparm: make lp_is_in_client() static - only used inside loadparm via 37f548d s3:loadparm: add lp_load_client() that also sets the client state internally via 1379ef8 s3:loadparm: add a convenience wrapper lp_load_global() via 1332911 s3:loadparm: rename parameter allow_registry_shares to load_all_shares from 427805b samba-tool: ensure prompting of passwords is in the right order http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0ad8c12d48d1d7bc57b8def7b638846499104265 Author: Michael Adam ob...@samba.org Date: Thu Jul 28 09:49:34 2011 +0200 s3:modules:nfs4_acls: improve fix for bug #8330 simplify the check insmbacl4_find_equal_special() Signed-off-by: Michael Adam ob...@samba.org Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Thu Jul 28 13:20:38 CEST 2011 on sn-devel-104 commit 7b7c6c85f16a69c346057fcfee830c65aa4b6ed0 Author: Michael Adam ob...@samba.org Date: Thu Jul 28 11:15:51 2011 +0200 s3:torture: use lp_load_global() in pdbtest - this does not need shares nor IPC$ commit a6fe4d20f192bf1bde7e632b03ee3e20776cf37e Author: Michael Adam ob...@samba.org Date: Thu Jul 28 11:04:53 2011 +0200 s3:winbindd: use lp_load_global() - winbindd does not need shares or IPC$ commit b793e02c6bb1962f44e8732cbf790b7912b7abe6 Author: Michael Adam ob...@samba.org Date: Thu Jul 28 10:39:45 2011 +0200 s3:smbstatus: use lp_load_global() - smbstatus does not need to load shares! commit 7c41dda1b3195c9e6cdca3fb1cc04d5cfeb1bdbe Author: Michael Adam ob...@samba.org Date: Thu Jul 28 10:34:09 2011 +0200 s3:split_tokens: use lp_load_global(), fixing the call to lp_load() this does not need share and it dos not need to save defaults commit d696beefb1efd2e3fa9f6c00f6ba88be01d4ac85 Author: Michael Adam ob...@samba.org Date: Thu Jul 28 10:33:15 2011 +0200 s3:split_tokens: fix a nonempty blank
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 553124a s3: In the async echo test, write 65k from 0ad8c12 s3:modules:nfs4_acls: improve fix for bug #8330 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 553124a663379335b401a56e498432d198b3d8e3 Author: Volker Lendecke v...@samba.org Date: Thu Jul 28 13:41:18 2011 +0200 s3: In the async echo test, write 65k This leads to the writev from echo responder child to parent to only deliver a partial blob and thus excercises the retry code. Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Thu Jul 28 15:07:40 CEST 2011 on sn-devel-104 --- Summary of changes: source3/torture/test_async_echo.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/torture/test_async_echo.c b/source3/torture/test_async_echo.c index f1d44ee..eb1f1d4 100644 --- a/source3/torture/test_async_echo.c +++ b/source3/torture/test_async_echo.c @@ -69,7 +69,7 @@ bool run_async_echo(int dummy) NTSTATUS status; bool ret = false; int i, num_reqs; - uint8_t buf[32768]; + uint8_t buf[65536]; printf(Starting ASYNC_ECHO\n); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a97fef3 s3-spoolss: Use existing handle in
printer_driver_files_in_use().
via 5fa9fe3 s3-spoolss: Use existing handle in printer_driver_in_use().
from 553124a s3: In the async echo test, write 65k
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a97fef36bccb856c9a6b7e1630f20dd3c394442e
Author: Andreas Schneider a...@samba.org
Date: Thu Jul 28 11:36:50 2011 +0200
s3-spoolss: Use existing handle in printer_driver_files_in_use().
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Thu Jul 28 16:20:11 CEST 2011 on sn-devel-104
commit 5fa9fe39ea30c210bfb2ab10cfc796ec4b521f78
Author: Andreas Schneider a...@samba.org
Date: Thu Jul 28 11:34:08 2011 +0200
s3-spoolss: Use existing handle in printer_driver_in_use().
---
Summary of changes:
source3/include/nt_printing.h |6 +---
source3/printing/nt_printing.c | 28 ++
source3/rpc_server/spoolss/srv_spoolss_nt.c | 12 +++---
3 files changed, 9 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 69e9f7f..1f13a1a 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -147,12 +147,10 @@ bool is_printer_published(TALLOC_CTX *mem_ctx,
WERROR check_published_printers(struct messaging_context *msg_ctx);
bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
- const struct auth_session_info *server_info,
- struct messaging_context *msg_ctx,
+ struct dcerpc_binding_handle *b,
const struct spoolss_DriverInfo8 *r);
bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
-const struct auth_session_info *server_info,
-struct messaging_context *msg_ctx,
+struct dcerpc_binding_handle *b,
struct spoolss_DriverInfo8 *r);
bool delete_driver_files(const struct auth_session_info *server_info,
const struct spoolss_DriverInfo8 *r);
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 7d1dd9e..2ceb540 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1174,16 +1174,14 @@ WERROR move_driver_to_download_area(struct
auth_session_info *session_info,
/
bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
- const struct auth_session_info *session_info,
- struct messaging_context *msg_ctx,
- const struct spoolss_DriverInfo8 *r)
+ struct dcerpc_binding_handle *b,
+ const struct spoolss_DriverInfo8 *r)
{
int snum;
int n_services = lp_numservices();
bool in_use = False;
struct spoolss_PrinterInfo2 *pinfo2 = NULL;
WERROR result;
- struct dcerpc_binding_handle *b = NULL;
if (!r) {
return false;
@@ -1198,16 +1196,6 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
continue;
}
- if (b == NULL) {
- result = winreg_printer_binding_handle(mem_ctx,
- session_info,
- msg_ctx,
- b);
- if (!W_ERROR_IS_OK(result)) {
- return false;
- }
- }
-
result = winreg_get_printer(mem_ctx, b,
lp_servicename(snum),
pinfo2);
@@ -1413,8 +1401,7 @@ static bool trim_overlap_drv_files(TALLOC_CTX *mem_ctx,
/
bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
-const struct auth_session_info *session_info,
-struct messaging_context *msg_ctx,
+struct dcerpc_binding_handle *b,
struct spoolss_DriverInfo8 *info)
{
int i;
@@ -1424,7 +1411,6 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
uint32_t num_drivers;
const char **drivers;
WERROR result;
- struct dcerpc_binding_handle *b;
if ( !info )
return False;
@@ -1437,14 +1423,6 @@ bool
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e84c7a2 s3-rpc_server: Use talloc for pipe_rpc_fns
via 48a7166 s3-rpc_server: remove useless code
via 262af47 s3-rpc_server: remove unnecessary talloc_free
via 0a72744 s3-rpc_server: Remove dead code
from a97fef3 s3-spoolss: Use existing handle in
printer_driver_files_in_use().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e84c7a2e26d206f38bcb94d4d1b6c854cdd4094c
Author: Simo Sorce i...@samba.org
Date: Wed Jul 27 16:40:21 2011 -0400
s3-rpc_server: Use talloc for pipe_rpc_fns
Everything uses talloc in the rpc server nowadays, remove this ancient use
of
malloc. This also allows us to remove the free fucntion and let talloc
handle
it properly.
Autobuild-User: Simo Sorce i...@samba.org
Autobuild-Date: Thu Jul 28 17:41:08 CEST 2011 on sn-devel-104
commit 48a71664f21f50616749b467e6f082b6c20036a1
Author: Simo Sorce i...@samba.org
Date: Wed Jul 27 16:30:42 2011 -0400
s3-rpc_server: remove useless code
We do not reuse pies_struct so there is no reason to SERO_STRUCT() it when
we
are freeing it as we are done using it anyways.
commit 262af4713e192ba80327c1e6607ba8f92d3cc7ea
Author: Simo Sorce i...@samba.org
Date: Wed Jul 27 16:27:17 2011 -0400
s3-rpc_server: remove unnecessary talloc_free
The auth_ctx is a child of pipes_struct, and this function is a used only
as a
destructor on pipes_struct. So it is not really necessary to free this
struct
in the destructor as it will be freed soon enough anyway.
commit 0a72744dd247298fe6aff160d77ae50dc97b8c4f
Author: Simo Sorce i...@samba.org
Date: Wed Jul 27 15:51:17 2011 -0400
s3-rpc_server: Remove dead code
srv_str and cli_str are not used anymore.
---
Summary of changes:
source3/rpc_server/rpc_handles.c | 20
source3/rpc_server/rpc_ncacn_np.c |7 ---
source3/rpc_server/rpc_server.c | 16
source3/rpc_server/srv_pipe.c |6 +++---
4 files changed, 7 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index f9251ee..87145ca 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -107,20 +107,6 @@ bool check_open_pipes(void)
Close an rpc pipe.
/
-static void free_pipe_rpc_context_internal(struct pipe_rpc_fns *list)
-{
- struct pipe_rpc_fns *tmp = list;
- struct pipe_rpc_fns *tmp2;
-
- while (tmp) {
- tmp2 = tmp-next;
- SAFE_FREE(tmp);
- tmp = tmp2;
- }
-
- return;
-}
-
int close_internal_rpc_pipe_hnd(struct pipes_struct *p)
{
if (!p) {
@@ -128,17 +114,11 @@ int close_internal_rpc_pipe_hnd(struct pipes_struct *p)
return False;
}
- TALLOC_FREE(p-auth.auth_ctx);
-
/* Free the handles database. */
close_policy_by_pipe(p);
- free_pipe_rpc_context_internal( p-contexts );
-
DLIST_REMOVE(InternalPipes, p);
- ZERO_STRUCTP(p);
-
return 0;
}
diff --git a/source3/rpc_server/rpc_ncacn_np.c
b/source3/rpc_server/rpc_ncacn_np.c
index 2ed4a01..1080a98 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -80,10 +80,11 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX
*mem_ctx,
return NULL;
}
- context_fns = SMB_MALLOC_P(struct pipe_rpc_fns);
+ context_fns = talloc(p, struct pipe_rpc_fns);
if (context_fns == NULL) {
- DEBUG(0,(malloc() failed!\n));
- return False;
+ DEBUG(0,(talloc() failed!\n));
+ TALLOC_FREE(p);
+ return NULL;
}
context_fns-next = context_fns-prev = NULL;
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 269b701..2e109a5 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -934,8 +934,6 @@ static void dcerpc_ncacn_accept(struct tevent_context
*ev_ctx,
dcerpc_ncacn_disconnect_fn fn) {
struct dcerpc_ncacn_conn *ncacn_conn;
struct tevent_req *subreq;
- const char *cli_str;
- const char *srv_str = NULL;
bool system_user = false;
char *pipe_name;
NTSTATUS status;
@@ -1046,20 +1044,6 @@ static void dcerpc_ncacn_accept(struct tevent_context
*ev_ctx,
return;
}
- if (tsocket_address_is_inet(ncacn_conn-client, ip)) {
- cli_str = ncacn_conn-client_name;
- } else {
- cli_str = ;
- }
-
- if (ncacn_conn-server !=
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5812645 s3: Priorize the async echo responder over the client
via 8374055 tevent: Slightly simplify poll_event_loop_poll
via 4dd0a3b s3: Remove unused smbd_echo_reader()
via 710e5d9 s3: Use smbd_echo_read_send in the async echo handler
via 27afb89 s3: Add smbd_echo_read_send/recv
via 4281967 Add wait_for_read_send/recv
from e84c7a2 s3-rpc_server: Use talloc for pipe_rpc_fns
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5812645f496e85d2178e7f0b9812c95ed651ded5
Author: Volker Lendecke v...@samba.org
Date: Thu Jul 28 14:24:40 2011 +0200
s3: Priorize the async echo responder over the client
Without this, an active client connection can starve the echo responder.
This
leads to apparently lost SMBs.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Thu Jul 28 18:53:38 CEST 2011 on sn-devel-104
commit 83740555ea8664da0830f88a1dd5afa69880bb40
Author: Volker Lendecke v...@samba.org
Date: Thu Jul 28 14:09:13 2011 +0200
tevent: Slightly simplify poll_event_loop_poll
No real code change. Do an early return instead of an if-statement, avoiding
one level of indentation.
commit 4dd0a3b5e29e3a39e90a425a827d6a17b9868ced
Author: Volker Lendecke v...@samba.org
Date: Tue Jul 26 15:39:58 2011 +0200
s3: Remove unused smbd_echo_reader()
commit 710e5d92562b2f43a20a33575ea0ec44e9b49a0a
Author: Volker Lendecke v...@samba.org
Date: Tue Jul 26 15:39:29 2011 +0200
s3: Use smbd_echo_read_send in the async echo handler
commit 27afb8910fabd51641d3e0129c16c7c1156f8541
Author: Volker Lendecke v...@samba.org
Date: Tue Jul 26 15:07:22 2011 +0200
s3: Add smbd_echo_read_send/recv
Read a SMB packet in the echo responder, giving the parent one second to
step
in
commit 428196799028d80a5fe3b09392cb7015049c5397
Author: Volker Lendecke v...@samba.org
Date: Tue Jul 26 15:06:44 2011 +0200
Add wait_for_read_send/recv
Wait for readability of a socket as a tevent_req
---
Summary of changes:
lib/async_req/async_sock.c | 55 +++
lib/async_req/async_sock.h |5 +
lib/tevent/tevent_poll.c | 71 +-
source3/smbd/process.c | 343 ++--
4 files changed, 335 insertions(+), 139 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index dfb1a1c..811cf8d 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -667,3 +667,58 @@ ssize_t read_packet_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
*pbuf = talloc_move(mem_ctx, state-buf);
return talloc_get_size(*pbuf);
}
+
+struct wait_for_read_state {
+ struct tevent_req *req;
+ struct tevent_fd *fde;
+};
+
+static void wait_for_read_done(struct tevent_context *ev,
+ struct tevent_fd *fde,
+ uint16_t flags,
+ void *private_data);
+
+struct tevent_req *wait_for_read_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ int fd)
+{
+ struct tevent_req *req;
+ struct wait_for_read_state *state;
+
+ req = tevent_req_create(mem_ctx, state, struct wait_for_read_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state-req = req;
+ state-fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ,
+ wait_for_read_done, state);
+ if (tevent_req_nomem(state-fde, req)) {
+ return tevent_req_post(req, ev);
+ }
+ return req;
+}
+
+static void wait_for_read_done(struct tevent_context *ev,
+ struct tevent_fd *fde,
+ uint16_t flags,
+ void *private_data)
+{
+ struct wait_for_read_state *state = talloc_get_type_abort(
+ private_data, struct wait_for_read_state);
+
+ if (flags TEVENT_FD_READ) {
+ TALLOC_FREE(state-fde);
+ tevent_req_done(state-req);
+ }
+}
+
+bool wait_for_read_recv(struct tevent_req *req, int *perr)
+{
+ int err;
+
+ if (tevent_req_is_unix_error(req, err)) {
+ *perr = err;
+ return false;
+ }
+ return true;
+}
diff --git a/lib/async_req/async_sock.h b/lib/async_req/async_sock.h
index 8d98886..1910643 100644
--- a/lib/async_req/async_sock.h
+++ b/lib/async_req/async_sock.h
@@ -61,4 +61,9 @@ struct tevent_req *read_packet_send(TALLOC_CTX *mem_ctx,
ssize_t read_packet_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
uint8_t **pbuf, int *perrno);
+struct tevent_req
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via fcb90f4 s3-printing: Add forward declaration for dcerpc_binding_handle. from 5812645 s3: Priorize the async echo responder over the client http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fcb90f476159583443d37f5844b1021d9e200b33 Author: Andreas Schneider a...@samba.org Date: Thu Jul 28 17:12:24 2011 +0200 s3-printing: Add forward declaration for dcerpc_binding_handle. This fixes a build warning. Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Thu Jul 28 20:07:37 CEST 2011 on sn-devel-104 --- Summary of changes: source3/include/nt_printing.h |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index 1f13a1a..4735c4e 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -146,6 +146,8 @@ bool is_printer_published(TALLOC_CTX *mem_ctx, WERROR check_published_printers(struct messaging_context *msg_ctx); +struct dcerpc_binding_handle; + bool printer_driver_in_use(TALLOC_CTX *mem_ctx, struct dcerpc_binding_handle *b, const struct spoolss_DriverInfo8 *r); -- Samba Shared Repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-451-g7467a04
The branch, 1.2 has been updated via 7467a04eb9fa5c25fea3870d7795c9c00222a6d9 (commit) via 889f9df7cacf1191097883182802ccf10daf111b (commit) via fe84e07e94675ade4db56b2e55fa049476171633 (commit) via 4677a17aef0f42af94fd8a5ba800d5df9bcd36e9 (commit) via 1a184c487b2db160f84bca16d1c2e721ff0628eb (commit) from 6d7a6d81b9de77b1d0b1bd42e870e99922ef9f76 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2 - Log - commit 7467a04eb9fa5c25fea3870d7795c9c00222a6d9 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Jul 29 08:57:51 2011 +1000 new version 1.2.32 commit 889f9df7cacf1191097883182802ccf10daf111b Author: Martin Schwenke mar...@meltin.net Date: Thu Jul 28 15:22:42 2011 +1000 Tests: Initial test code for LCP2 IP allocation algorithm. Move struct ctdb_public_ip_list to ctdb_private.h and put some definitions for some functions from ctdb_takeover.c there. This allows those functions to be called from unit tests. Add ctdb_takeover_tests.c and the Makefile support to build it. Signed-off-by: Martin Schwenke mar...@meltin.net commit fe84e07e94675ade4db56b2e55fa049476171633 Author: Martin Schwenke mar...@meltin.net Date: Thu Jul 28 15:16:46 2011 +1000 IP allocation - add LCP2 algorithm. The current non-deterministic IP allocation algorithm balances IPs across the whole cluster. It does not consider different interfaces/VLANs/subnets, so these different groups of IPs aren't generally well balanced. This adds the LCP2 algorithm for IP allocation and allows it to be enabled by setting the LCP2PublicIPs tunable to 1. The LCP2 algorithm calculates the imbalance of a node by totalling the squares of the distances between each IP on the node. The IP distance is defined as the length longest common prefix (LCP) of bits that is found when comparing 2 IPs. The imbalance of a cluster is the maximum imbalance for any node. At each step the algorithm selects an allocation to the IP/node combination that results in the choosing the allocation that best reduces the imbalance of the cluster. The implementation splits out the IP allocation part of ctdb_takeover_run() into new function ctdb_takeover_run_core(), and then extracts out the basic IP assignment code into new functions basic_allocate_unassigned() and basic_failback(). 3 new functions lcp2_init(), lcp2_allocate_unassigned() and lcp2_failback() implement the LCP2 algorithm, and are hooked into ctdb_takeover_run_core(). Signed-off-by: Martin Schwenke mar...@meltin.net commit 4677a17aef0f42af94fd8a5ba800d5df9bcd36e9 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Jul 29 08:41:35 2011 +1000 Update the delip command Dont talloc_free(vnn) immediately but postphone it until later when the eventscript callback has completed. CQ S1026664 commit 1a184c487b2db160f84bca16d1c2e721ff0628eb Author: Rusty Russell ru...@rustcorp.com.au Date: Mon Jul 25 17:56:06 2011 +0930 eventscript: fix callback after free ctdb_event_script_callback() takes a mem_ctx arg which it doesn't use, but the implication is pretty clear, that when that mem_ctx is freed, the callback shouldn't happen. Indeed, Ronnie reproduced a case where that callback refers to freed memory, in the ip reallocation code under stress. So attach the callback to the mem_ctx they give us, and remove it from the script state structure when that's freed. It's a bit weird, but it works. CQ: S1026179 Signed-off-by: Rusty Russell ru...@rustcorp.com.au --- Summary of changes: Makefile.in |7 + include/ctdb_private.h | 34 ++ packaging/RPM/ctdb.spec.in |5 +- server/ctdb_takeover.c | 656 --- server/ctdb_tunables.c |1 + server/eventscript.c| 50 +++- tests/src/ctdb_takeover_tests.c | 378 ++ 7 files changed, 1003 insertions(+), 128 deletions(-) create mode 100644 tests/src/ctdb_takeover_tests.c Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index aec64e1..5fa9e98 100755 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,7 @@ TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \ tests/bin/ctdb_fetch_lock_once tests/bin/ctdb_store \ tests/bin/ctdb_randrec tests/bin/ctdb_persistent \ tests/bin/ctdb_traverse tests/bin/rb_test tests/bin/ctdb_transaction \ + tests/bin/ctdb_takeover_tests @INFINIBAND_BINS@ BINS = bin/ctdb @CTDB_SCSI_IO@ bin/smnotify bin/ping_pong bin/ltdbtool @@ -190,6 +191,12 @@ tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ)
[SCM] CTDB repository - branch 1.2.27 updated - ctdb-1.9.1-424-ga57f1c5
The branch, 1.2.27 has been updated
via a57f1c5f7c6fce6df3d9f773527983a49bee75c0 (commit)
via de276bbc1a3df26e560d0ba37029584f48a7e92b (commit)
via 361d36677baeb4f22df1006e6f6b71c881ee7bf1 (commit)
via 976e968ea75db31c0b90c8de71536304e85c6521 (commit)
via 489e1d68bd7b83605ce8c1e2a978234a70f99a08 (commit)
from 636e2f02e44803d789c2af5c605b55db3bd32d04 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.27
- Log -
commit a57f1c5f7c6fce6df3d9f773527983a49bee75c0
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Jul 29 08:43:49 2011 +1000
new version 1.2.27-204
commit de276bbc1a3df26e560d0ba37029584f48a7e92b
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Jul 29 08:41:35 2011 +1000
Update the delip command
Dont talloc_free(vnn) immediately but postphone it until later when
the eventscript callback has completed.
CQ S1026664
commit 361d36677baeb4f22df1006e6f6b71c881ee7bf1
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Jul 25 21:18:31 2011 +1000
New version 1.2.27-203
commit 976e968ea75db31c0b90c8de71536304e85c6521
Author: Rusty Russell ru...@rustcorp.com.au
Date: Mon Jul 25 17:56:06 2011 +0930
eventscript: fix callback after free
ctdb_event_script_callback() takes a mem_ctx arg which it doesn't use, but
the implication is pretty clear, that when that mem_ctx is freed, the
callback
shouldn't happen. Indeed, Ronnie reproduced a case where that callback
refers to freed memory, in the ip reallocation code under stress.
So attach the callback to the mem_ctx they give us, and remove it from the
script state structure when that's freed. It's a bit weird, but it works.
CQ: S1026179
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
commit 489e1d68bd7b83605ce8c1e2a978234a70f99a08
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon May 9 06:35:33 2011 +1000
Remove logging of spam/errors from the 10.interfrace
script if/when we have for example NATGW configured but no public addresses
defined on that interface
CQ S1023378
---
Summary of changes:
config/events.d/10.interface | 19 +++
packaging/RPM/ctdb.spec.in | 10 +++-
server/ctdb_takeover.c |8 --
server/eventscript.c | 50 -
tools/ctdb.c | 16 ++--
5 files changed, 70 insertions(+), 33 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index b906e6a..f793673 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -13,7 +13,6 @@ loadconfig
}
[ ! -f $CTDB_PUBLIC_ADDRESSES ] {
- echo No public addresses file found. Nothing to do for 10.interfaces
exit 0
}
@@ -53,25 +52,25 @@ monitor_interfaces()
grep -q 'Currently Active Slave: None'
/proc/net/bonding/$REALIFACE {
echo ERROR: No active slaves for bond device
$REALIFACE
fail=1
- ctdb setifacelink $IFACE down
+ ctdb setifacelink $IFACE down /dev/null 2/dev/null
continue;
}
grep -q '^MII Status: up' /proc/net/bonding/$REALIFACE || {
echo ERROR: public network interface $REALIFACE is
down
fail=1
- ctdb setifacelink $IFACE down
+ ctdb setifacelink $IFACE down /dev/null 2/dev/null
continue;
}
grep -q '^Bonding Mode: IEEE 802.3ad Dynamic link aggregation'
/proc/net/bonding/$REALIFACE {
grep 'MII Status:' /proc/net/bonding/$REALIFACE | tail
-n +2 | grep -q '^MII Status: up' || {
echo No active slaves for 802.ad bond device
$REALIFACE
- ctdb setifacelink $IFACE down
+ ctdb setifacelink $IFACE down /dev/null
2/dev/null
fail=1
continue
}
}
ok=1 # we only set ok for interfaces known to ctdbd
- ctdb setifacelink $IFACE up
+ ctdb setifacelink $IFACE up /dev/null 2/dev/null
continue;
}
@@ -79,12 +78,12 @@ monitor_interfaces()
lo*)
# loopback is always working
ok=1 # we only set ok for interfaces known to ctdbd
- ctdb setifacelink $IFACE up
+ ctdb setifacelink $IFACE up /dev/null 2/dev/null
;;
ib*)
# we dont know how to test ib links
[SCM] CTDB repository - branch master updated - ctdb-1.10-230-g518945e
The branch, master has been updated via 518945e59e2e48f07fcc0955f3aa81cd0d946aea (commit) via 9d34be0233edf3bc022345c0494c4b2a4d7f8480 (commit) via 61fc7fbd0235469df22deb6581c6bd47e30bc0be (commit) via 0e60a738f9a6275ed45abc3d933f872d93132d92 (commit) via 0a99e8742a261b1d3a2c8830f5c19ea6c2c47cad (commit) via 6fcd867cc835ef1ffc1c50964f135c346503d40c (commit) from c6bfba2bb66962b7b05d708f0747002700991472 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 518945e59e2e48f07fcc0955f3aa81cd0d946aea Merge: 0e60a738f9a6275ed45abc3d933f872d93132d92 9d34be0233edf3bc022345c0494c4b2a4d7f8480 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Jul 29 09:04:01 2011 +1000 Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master commit 9d34be0233edf3bc022345c0494c4b2a4d7f8480 Author: Martin Schwenke mar...@meltin.net Date: Thu Jul 28 15:22:42 2011 +1000 Tests: Initial test code for LCP2 IP allocation algorithm. Move struct ctdb_public_ip_list to ctdb_private.h and put some definitions for some functions from ctdb_takeover.c there. This allows those functions to be called from unit tests. Add ctdb_takeover_tests.c and the Makefile support to build it. Signed-off-by: Martin Schwenke mar...@meltin.net commit 61fc7fbd0235469df22deb6581c6bd47e30bc0be Author: Martin Schwenke mar...@meltin.net Date: Thu Jul 28 15:16:46 2011 +1000 IP allocation - add LCP2 algorithm. The current non-deterministic IP allocation algorithm balances IPs across the whole cluster. It does not consider different interfaces/VLANs/subnets, so these different groups of IPs aren't generally well balanced. This adds the LCP2 algorithm for IP allocation and allows it to be enabled by setting the LCP2PublicIPs tunable to 1. The LCP2 algorithm calculates the imbalance of a node by totalling the squares of the distances between each IP on the node. The IP distance is defined as the length longest common prefix (LCP) of bits that is found when comparing 2 IPs. The imbalance of a cluster is the maximum imbalance for any node. At each step the algorithm selects an allocation to the IP/node combination that results in the choosing the allocation that best reduces the imbalance of the cluster. The implementation splits out the IP allocation part of ctdb_takeover_run() into new function ctdb_takeover_run_core(), and then extracts out the basic IP assignment code into new functions basic_allocate_unassigned() and basic_failback(). 3 new functions lcp2_init(), lcp2_allocate_unassigned() and lcp2_failback() implement the LCP2 algorithm, and are hooked into ctdb_takeover_run_core(). Signed-off-by: Martin Schwenke mar...@meltin.net commit 0e60a738f9a6275ed45abc3d933f872d93132d92 Merge: c6bfba2bb66962b7b05d708f0747002700991472 0a99e8742a261b1d3a2c8830f5c19ea6c2c47cad Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Jul 29 08:53:43 2011 +1000 Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master commit 0a99e8742a261b1d3a2c8830f5c19ea6c2c47cad Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Jul 29 08:41:35 2011 +1000 Update the delip command Dont talloc_free(vnn) immediately but postphone it until later when the eventscript callback has completed. CQ S1026664 commit 6fcd867cc835ef1ffc1c50964f135c346503d40c Author: Rusty Russell ru...@rustcorp.com.au Date: Mon Jul 25 17:56:06 2011 +0930 eventscript: fix callback after free ctdb_event_script_callback() takes a mem_ctx arg which it doesn't use, but the implication is pretty clear, that when that mem_ctx is freed, the callback shouldn't happen. Indeed, Ronnie reproduced a case where that callback refers to freed memory, in the ip reallocation code under stress. So attach the callback to the mem_ctx they give us, and remove it from the script state structure when that's freed. It's a bit weird, but it works. CQ: S1026179 Signed-off-by: Rusty Russell ru...@rustcorp.com.au --- Summary of changes: Makefile.in |7 + include/ctdb_private.h | 34 ++ server/ctdb_takeover.c | 656 --- server/ctdb_tunables.c |1 + server/eventscript.c| 50 +++- tests/src/ctdb_takeover_tests.c | 378 ++ 6 files changed, 999 insertions(+), 127 deletions(-) create mode 100644 tests/src/ctdb_takeover_tests.c Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index 8fb9ea7..d53d3db 100755 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,7 @@ TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2663586 s4-auth Fill in the remainder of the unix info in auth_session_info via f5963aa s4-auth Move conversion of security_token to unix_token to auth via e84b8a7 gensec: Add a way to request a unix token from GENSEC via d2a6ae2 ntvfs: Use security_unix_token from auth.idl via 8f13c84 s3-selftest Add tests for 'map to guest = bad user' via 2b47afa selftest: Avoid being run over by armies of the undead via b782b5e nbt: Add comment explaining that these responses are manually encoded via 61cb215 selftest: explain how the message command test works via ee20a27 s4-lsa Use the supplied handle in LsaLookupNames2 via 481f1e6 s4-debug: Start with DEBUG_DEFAULT_STDOUT, so we can log to a file in deamons from fcb90f4 s3-printing: Add forward declaration for dcerpc_binding_handle. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2663586c8bbda96822c9325de2966382a2341fca Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 21 18:21:19 2011 +1000 s4-auth Fill in the remainder of the unix info in auth_session_info Signed-off-by: Andrew Tridgell tri...@samba.org Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Fri Jul 29 05:33:03 CEST 2011 on sn-devel-104 commit f5963aad18de80e837448cbc29feb52081897667 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 21 17:06:17 2011 +1000 s4-auth Move conversion of security_token to unix_token to auth This allows us to honour the AUTH_SESSION_INFO_UNIX_TOKEN flag. Andrew Bartlett Signed-off-by: Andrew Tridgell tri...@samba.org commit e84b8a72bd63d3f4af810536068ae65d33aabff8 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 21 15:39:27 2011 +1000 gensec: Add a way to request a unix token from GENSEC Signed-off-by: Andrew Tridgell tri...@samba.org commit d2a6ae254a7c6afd2c58d1a9a2c9fd4c074b0afb Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 21 15:37:41 2011 +1000 ntvfs: Use security_unix_token from auth.idl Signed-off-by: Andrew Tridgell tri...@samba.org commit 8f13c84dcecb769e4ba85fa120d9ac4ac772223e Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 22 13:00:21 2011 +1000 s3-selftest Add tests for 'map to guest = bad user' Signed-off-by: Andrew Tridgell tri...@samba.org commit 2b47aface434000b29aa29f4ff6348cc147ae757 Author: Andrew Bartlett abart...@samba.org Date: Tue Jul 26 17:04:40 2011 +1000 selftest: Avoid being run over by armies of the undead Ignore SIGCHILD to reap zombies Andrew Bartlett Signed-off-by: Andrew Tridgell tri...@samba.org commit b782b5ed7c7a59fc60845c776c81cfcc56fdfda6 Author: Andrew Bartlett abart...@samba.org Date: Wed Jul 27 12:06:22 2011 +1000 nbt: Add comment explaining that these responses are manually encoded Signed-off-by: Andrew Tridgell tri...@samba.org commit 61cb2150cbd6922600964a70920ca90da9eb4368 Author: Andrew Bartlett abart...@samba.org Date: Wed Jul 27 15:42:45 2011 +1000 selftest: explain how the message command test works commit ee20a27d411c4f3c1d97e9c9bdbb7226f144c2f1 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 28 07:55:09 2011 +1000 s4-lsa Use the supplied handle in LsaLookupNames2 In my rework of this function in 2006 with 459a2301a5d63f5a1a6b27996c8a0358b20f2ab2 I ignored the incoming handle, instead feching the LSA state again (dispite the commit message indicating otherwise). This means that data-access_mask is uninitialised, which doesn't matter right now, but will once we start checking that. Andrew Bartlett commit 481f1e601daafd186c504476f7efa1b557099105 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 29 12:10:39 2011 +1000 s4-debug: Start with DEBUG_DEFAULT_STDOUT, so we can log to a file in deamons In commit 3c9d01e3e58e2217915317406541ac8c6f6dcf92 I changed the priority order and added DEBUG_DEFAULT_STDOUT, but did not check all the callers. Andrew Bartlett --- Summary of changes: librpc/idl/nbt.idl|6 +- selftest/selftest.pl |2 + selftest/target/Samba3.pm | 34 source3/script/tests/test_smbclient_s3.sh |1 + source3/selftest/tests.py |5 +- source4/auth/auth.h |3 + source4/auth/gensec/gensec.c | 17 +++- source4/auth/gensec/gensec.h |1 + source4/auth/ntlm/auth.c | 31 ++- source4/auth/ntlm/wscript_build |2 +- source4/auth/session.c|2 +- source4/auth/unix_token.c | 129
