The branch, master has been updated
via 754b925 s3: Fix a typo
via c093666 s3: Avoid a call to server_event_context()
from c983ea8 s4-join: Setup correct DNS configuration
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 754b925ccde2a46c5fdcb00141374d5c55fc5ff9
Author: Volker Lendecke <[email protected]>
Date: Mon Jun 25 11:07:22 2012 +0200
s3: Fix a typo
Signed-off-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Mon Jun 25 17:13:59 CEST 2012 on sn-devel-104
commit c0936663a86ca8515b8a38bdd4feee5250171032
Author: Volker Lendecke <[email protected]>
Date: Mon Jun 25 11:07:06 2012 +0200
s3: Avoid a call to server_event_context()
Signed-off-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_aio_pthread.c | 4 ++--
source3/smbd/open.c | 2 +-
source3/smbd/smb2_create.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aio_pthread.c
b/source3/modules/vfs_aio_pthread.c
index 36ce9ab..695ba12 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -69,7 +69,7 @@ static bool init_aio_threadpool(struct vfs_handle_struct
*handle)
errno = ret;
return false;
}
- sock_event = tevent_add_fd(server_event_context(),
+ sock_event = tevent_add_fd(handle->conn->sconn->ev_ctx,
NULL,
pthreadpool_signal_fd(pool),
TEVENT_FD_READ,
@@ -472,7 +472,7 @@ static void aio_pthread_handle_suspend_completion(struct
event_context *event_ct
}
/* Jobid completed we weren't waiting for.
- We must reshedule this as an immediate event
+ We must reschedule this as an immediate event
on the main event context. */
im = tevent_create_immediate(NULL);
if (!im) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 273f3b2..f259cc9 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2376,7 +2376,7 @@ static NTSTATUS open_file_ntcreate(connection_struct
*conn,
if (file_existed && (flags2&O_TRUNC)) {
/*
- * We are modifing the file after open - update the stat
+ * We are modifying the file after open - update the stat
* struct..
*/
if ((SMB_VFS_FTRUNCATE(fsp, 0) == -1) ||
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 9881ed2..7dd7c5c 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1066,7 +1066,7 @@ void schedule_deferred_open_message_smb2(
/*
* This is subtle. We must null out the callback
- * before resheduling, else the first call to
+ * before rescheduling, else the first call to
* tevent_req_nterror() causes the _receive()
* function to be called, this causing tevent_req_post()
* to crash.
@@ -1124,7 +1124,7 @@ static void smb2_deferred_open_timer(struct event_context
*ev,
/*
* This is subtle. We must null out the callback
- * before resheduling, else the first call to
+ * before rescheduling, else the first call to
* tevent_req_nterror() causes the _receive()
* function to be called, this causing tevent_req_post()
* to crash.
--
Samba Shared Repository
