[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  7906d0b s3: Fix smbd -i
       via  c86584a s3: Fix typos
      from  20b79c3 upgradedns: Upgrade DNS provision from BIND9_FLATFILE to AD based DNS

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7906d0b50b5c880a2557078e73d46f22db6b9cf5
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 21 15:39:45 2012 +0100

    s3: Fix smbd -i
    
    We end up in a nested event loop without this.
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Tue Feb 21 17:24:28 CET 2012 on sn-devel-104

commit c86584adaf25ee811c20eb28f136d30c3842c4b8
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 21 13:25:34 2012 +0100

    s3: Fix typos

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/nttrans.c |    4 ++--
 source3/smbd/server.c  |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index ddabdda..cfa048b 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -343,7 +343,7 @@ static void do_ntcreate_pipe_open(connection_struct *conn,
 	if (flags & EXTENDED_RESPONSE_REQUIRED) {
 		/* This is very strange. We
  		 * return 50 words, but only set
- 		 * the wcnt to 42 ? It's definately
+		 * the wcnt to 42 ? It's definitely
  		 * what happens on the wire....
  		 */
 		reply_outbuf(req, 50, 0);
@@ -625,7 +625,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
 	if (flags & EXTENDED_RESPONSE_REQUIRED) {
 		/* This is very strange. We
  		 * return 50 words, but only set
- 		 * the wcnt to 42 ? It's definately
+		 * the wcnt to 42 ? It's definitely
  		 * what happens on the wire....
  		 */
 		reply_outbuf(req, 50, 0);
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 182b346..f89bfd4 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -466,6 +466,7 @@ static void smbd_accept_connection(struct tevent_context *ev,
 	}
 
 	if (s->parent->interactive) {
+		tevent_re_initialise(ev);
 		smbd_process(ev, sconn);
 		exit_server_cleanly("end of interactive mode");
 		return;


-- 
Samba Shared Repository