diff options
| author | Gerald Carter <jerry@samba.org> | 2004-08-18 13:55:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:23 -0500 |
| commit | 1842fde7d10a6faccae1a24ebc67f8452a5a828e (patch) | |
| tree | 1bb8a33a0ef7bea01532731ccbd965f5590e29a2 /source3/smbd | |
| parent | 5cd11b7127afed6a1e4e540721fa15d45aec471b (diff) | |
| download | samba-1842fde7d10a6faccae1a24ebc67f8452a5a828e.tar.gz samba-1842fde7d10a6faccae1a24ebc67f8452a5a828e.tar.bz2 samba-1842fde7d10a6faccae1a24ebc67f8452a5a828e.zip | |
r1885: tighten the cache consistency with the ntprinters.tdb entry an the in memory cache associated with open printer handles; also make sure that register_messages_flags() doesn't overwrite the originally registers flags
(This used to be commit 540daf71d8ad189af5dd6d45aa1ce2b3d67da752)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/connection.c | 1 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c index 5bb76eb3bd..fc5fe9d741 100644 --- a/source3/smbd/connection.c +++ b/source3/smbd/connection.c @@ -222,7 +222,6 @@ BOOL register_message_flags(BOOL doreg, uint32 msg_flags) } pcrec = (struct connections_data *)dbuf.dptr; - pcrec->bcast_msg_flags = msg_flags; if (doreg) pcrec->bcast_msg_flags |= msg_flags; else diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 74872eeea9..611fb04c19 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -242,7 +242,7 @@ int reply_special(char *inbuf,char *outbuf) reload_services(True); reopen_logs(); - claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); + claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_PRINT_GENERAL); already_got_session = True; break; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 16281dd86c..0fe633bb96 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -846,6 +846,8 @@ void build_options(BOOL screen); exit(1); /* Setup the main smbd so that we can get messages. */ + /* don't worry about general printing messages here */ + claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); /* only start the background queue daemon if we are |