summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/librpc/rpc/dcerpc_schannel.c16
-rw-r--r--source4/ntvfs/posix/pvfs_search.c2
2 files changed, 2 insertions, 16 deletions
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index a98ed50b9a..3ae2624ff9 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -162,21 +162,7 @@ NTSTATUS dcerpc_bind_auth_schannel(TALLOC_CTX *tmp_ctx,
DEBUG(1, ("Failed to setup credentials for account %s: %s\n",
cli_credentials_get_username(credentials),
nt_errstr(status)));
- /*
- * If we get back NT_STATUS_ACCESS_DENIED and we asked for
- * DCERPC_SCHANNEL_128, then try again without
- */
- if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
- p->conn->flags & DCERPC_SCHANNEL_128) {
- DEBUG(1, ("Retrying to setup credentials without DCERPC_SCHANNEL_128\n"));
- p->conn->flags &= ~DCERPC_SCHANNEL_128;
- status = dcerpc_schannel_key(tmp_ctx,
- p, credentials,
- chan_type);
- }
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
+ return status;
}
return dcerpc_bind_auth_password(p, uuid, version,
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 965e9ac266..69ca6ef997 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -266,7 +266,7 @@ static NTSTATUS pvfs_search_fill(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
talloc_free(file);
}
- /*pvfs_list_hibernate(dir);*/
+ pvfs_list_hibernate(dir);
return NT_STATUS_OK;
}