diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-24 16:29:24 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-24 16:29:24 +1100 |
| commit | 34ee56eadce9f84d52a1c9668cf321e04ede2bc0 (patch) | |
| tree | 7e417710edeecc5e8e3c8c40986c22ae0fec61f6 | |
| parent | 2a8f367b0ff567223144bd41e97684301d540f57 (diff) | |
| parent | 130582f170cdcc2b6eb2a950ca4ebda916c8399a (diff) | |
| download | samba-34ee56eadce9f84d52a1c9668cf321e04ede2bc0.tar.gz samba-34ee56eadce9f84d52a1c9668cf321e04ede2bc0.tar.bz2 samba-34ee56eadce9f84d52a1c9668cf321e04ede2bc0.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
| -rw-r--r-- | source3/modules/onefs_open.c | 9 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index c5030f4ab8..5a488f894c 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -386,15 +386,6 @@ static void defer_open(struct share_mode_lock *lck, exit_server("push_deferred_smb_message failed"); } add_deferred_open(lck, req->mid, request_time, state->id); - - /* - * Push the MID of this packet on the signing queue. - * We only do this once, the first time we push the packet - * onto the deferred open queue, as this has a side effect - * of incrementing the response sequence number. - */ - - srv_defer_sign_response(req->mid); } static void schedule_defer_open(struct share_mode_lock *lck, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8460fea567..66fb8bf1bc 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9542,10 +9542,6 @@ const char *lp_printcapname(void) return PRINTCAP_NAME; } -/******************************************************************* - Ensure we don't use sendfile if server smb signing is active. -********************************************************************/ - static uint32 spoolss_state; bool lp_disable_spoolss( void ) |