The branch, master has been updated
via 3e0b2c8... s3: Fix some debug messages
via 2e4c414... s3: Don't announce readraw and writeraw with the async
echo responder
from 82e140c... s3: use shared security defines.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3e0b2c8c9ae557e615fe3551f561a622c1fa29cd
Author: Volker Lendecke <[email protected]>
Date: Wed May 26 17:52:10 2010 +0200
s3: Fix some debug messages
commit 2e4c41431e18ed68f0965cdb128d67b008f81389
Author: Volker Lendecke <[email protected]>
Date: Wed May 26 17:47:37 2010 +0200
s3: Don't announce readraw and writeraw with the async echo responder
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 2 ++
source3/param/loadparm.c | 20 ++++++++++++++++++--
source3/smbd/reply.c | 8 ++++----
3 files changed, 24 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ee6f09a..bd39973 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3947,8 +3947,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 ba9d816..2d389d4 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5569,9 +5569,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)
@@ -10021,3 +10021,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/reply.c b/source3/smbd/reply.c
index 8aa1633..5107b1a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3055,8 +3055,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;
@@ -3787,8 +3787,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 Shared Repository
