diff options
| author | Volker Lendecke <vl@samba.org> | 2012-05-07 12:22:50 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-05-25 09:19:37 -0700 |
| commit | 19b6671c07be2419398a07f202e22abefe562176 (patch) | |
| tree | f7835ba7e29de68056bc615f5af2f07ba69daa9f | |
| parent | 6526432682760f182fdd9152b923fa3468c042ff (diff) | |
| download | samba-19b6671c07be2419398a07f202e22abefe562176.tar.gz samba-19b6671c07be2419398a07f202e22abefe562176.tar.bz2 samba-19b6671c07be2419398a07f202e22abefe562176.zip | |
s3: Check for serverid_exists in notify_deferred_opens
We will remove the check in parse_share_modes soon
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/close.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 22d756c5c1..354a68c546 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -179,9 +179,15 @@ static void notify_deferred_opens(struct smbd_server_connection *sconn, num_deferred = 0; for (i=0; i<lck->data->num_share_modes; i++) { - if (is_deferred_open_entry(&lck->data->share_modes[i])) { - num_deferred += 1; + struct share_mode_entry *e = &lck->data->share_modes[i]; + + if (!is_deferred_open_entry(e)) { + continue; + } + if (share_mode_stale_pid(lck->data, i)) { + continue; } + num_deferred += 1; } if (num_deferred == 0) { return; |