[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.7-ctdb-4-10-ge72c09a

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  e72c09a5827c2abba3534263a18c78e6c8e0582a (commit)
       via  1da29b98ecfaca11e4be8d0b23e25f1f3668cf96 (commit)
       via  fc62e1690b75275035e58b1a3ea8c11842533992 (commit)
      from  fce4c325d9020dc4f67dd847649dc9bfa3d6cbd7 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit e72c09a5827c2abba3534263a18c78e6c8e0582a
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 26 17:52:10 2010 +0200

    s3: Fix some debug messages

commit 1da29b98ecfaca11e4be8d0b23e25f1f3668cf96
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 26 17:47:37 2010 +0200

    s3: Don't announce readraw and writeraw with the async echo responder

commit fc62e1690b75275035e58b1a3ea8c11842533992
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 27 18:12:30 2010 +0200

    s3: Fix a bad memleak in the async echo responder

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

Summary of changes:
 source3/include/proto.h  |    2 ++
 source3/param/loadparm.c |   20 ++++++++++++++++++--
 source3/smbd/process.c   |    2 +-
 source3/smbd/reply.c     |    8 ++++----
 4 files changed, 25 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0ec3cc0..dab38a9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4038,8 +4038,10 @@ const char **lp_init_logon_delayed_hosts(void);
 int lp_init_logon_delay(void);
 bool lp_load_printers(void);
 bool lp_readraw(void);
+bool _lp_readraw(void);
 bool lp_large_readwrite(void);
 bool lp_writeraw(void);
+bool _lp_writeraw(void);
 bool lp_null_passwords(void);
 bool lp_obey_pam_restrictions(void);
 bool lp_encrypted_passwords(void);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 92b4967..5ee1058 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5476,9 +5476,9 @@ FN_GLOBAL_BOOL(lp_domain_logons, &Globals.bDomainLogons)
 FN_GLOBAL_LIST(lp_init_logon_delayed_hosts, &Globals.szInitLogonDelayedHosts)
 FN_GLOBAL_INTEGER(lp_init_logon_delay, &Globals.InitLogonDelay)
 FN_GLOBAL_BOOL(lp_load_printers, &Globals.bLoadPrinters)
-FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
+FN_GLOBAL_BOOL(_lp_readraw, &Globals.bReadRaw)
 FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite)
-FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw)
+FN_GLOBAL_BOOL(_lp_writeraw, &Globals.bWriteRaw)
 FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords)
 FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &Globals.bObeyPamRestrictions)
 FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords)
@@ -9892,3 +9892,19 @@ bool lp_widelinks(int snum)
 
 	return lp_widelinks_internal(snum);
 }
+
+bool lp_writeraw(void)
+{
+	if (lp_async_smb_echo_handler()) {
+		return false;
+	}
+	return _lp_writeraw();
+}
+
+bool lp_readraw(void)
+{
+	if (lp_async_smb_echo_handler()) {
+		return false;
+	}
+	return _lp_readraw();
+}
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 36640cb..e13d6fd 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2366,7 +2366,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
 
 	DEBUG(10,("echo_handler[%d]: reading pdu\n", (int)sys_getpid()));
 
-	status = receive_smb_talloc(state, smbd_server_fd(),
+	status = receive_smb_talloc(state->pending, smbd_server_fd(),
 				    (char **)(void *)&state->pending[num_pending].iov_base,
 				    0 /* timeout */,
 				    &unread,
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a898d5a..8a186b7 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2941,8 +2941,8 @@ void reply_readbraw(struct smb_request *req)
 	}
 
 	if (smbd_server_conn->smb1.echo_handler.trusted_fde) {
-		DEBUG(2,("SMBreadbraw rejected with NOT_SUPPORTED because of"
-			 "'fork echo handler = yes'\n"));
+		DEBUG(2,("SMBreadbraw rejected with NOT_SUPPORTED because of "
+			 "'async smb echo handler = yes'\n"));
 		reply_readbraw_error();
 		END_PROFILE(SMBreadbraw);
 		return;
@@ -3649,8 +3649,8 @@ void reply_writebraw(struct smb_request *req)
 	}
 
 	if (smbd_server_conn->smb1.echo_handler.trusted_fde) {
-		DEBUG(2,("SMBwritebraw rejected with NOT_SUPPORTED because of"
-			 "'fork echo handler = yes'\n"));
+		DEBUG(2,("SMBwritebraw rejected with NOT_SUPPORTED because of "
+			 "'async smb echo handler = yes'\n"));
 		reply_nterror(req, NT_STATUS_NOT_SUPPORTED);
 		error_to_writebrawerr(req);
 		END_PROFILE(SMBwritebraw);


-- 
SAMBA-CTDB repository