summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-05-07 16:34:11 +0200
committerJeremy Allison <jra@samba.org>2012-05-25 09:19:38 -0700
commit58dff077d994b66591f5c208112027959336b178 (patch)
treee164a98dce0c4133e967460a4240f90d6bf52d6a
parent50fdb32a4d30128d3e23d98833b31b84fc3f8215 (diff)
downloadsamba-58dff077d994b66591f5c208112027959336b178.tar.gz
samba-58dff077d994b66591f5c208112027959336b178.tar.bz2
samba-58dff077d994b66591f5c208112027959336b178.zip
s3: Do not check the PIDs is parse_share_modes
We do that when conflicts arise Signed-off-by: Jeremy Allison <jra@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/locking/share_mode_lock.c42
1 files changed, 0 insertions, 42 deletions
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 493bc15bea..171c72fd67 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -118,9 +118,6 @@ static struct share_mode_data *parse_share_modes(TALLOC_CTX *mem_ctx,
const TDB_DATA dbuf)
{
struct share_mode_data *d;
- int i;
- struct server_id *pids;
- bool *pid_exists;
enum ndr_err_code ndr_err;
DATA_BLOB blob;
@@ -148,45 +145,6 @@ static struct share_mode_data *parse_share_modes(TALLOC_CTX *mem_ctx,
NDR_PRINT_DEBUG(share_mode_data, d);
}
- /*
- * Ensure that each entry has a real process attached.
- */
-
- pids = talloc_array(talloc_tos(), struct server_id,
- d->num_share_modes);
- if (pids == NULL) {
- DEBUG(0, ("talloc failed\n"));
- goto fail;
- }
- pid_exists = talloc_array(talloc_tos(), bool, d->num_share_modes);
- if (pid_exists == NULL) {
- DEBUG(0, ("talloc failed\n"));
- goto fail;
- }
-
- for (i=0; i<d->num_share_modes; i++) {
- pids[i] = d->share_modes[i].pid;
- }
- if (!serverids_exist(pids, d->num_share_modes, pid_exists)) {
- DEBUG(0, ("serverid_exists failed\n"));
- goto fail;
- }
-
- i = 0;
- while (i < d->num_share_modes) {
- struct share_mode_entry *e = &d->share_modes[i];
- if (!pid_exists[i]) {
- DEBUG(10, ("wipe non-existent pid %s\n",
- procid_str_static(&e->pid)));
- *e = d->share_modes[d->num_share_modes-1];
- d->num_share_modes -= 1;
- d->modified = True;
- continue;
- }
- i += 1;
- }
- TALLOC_FREE(pid_exists);
- TALLOC_FREE(pids);
return d;
fail:
TALLOC_FREE(d);