diff options
| author | Richard Sharpe <sharpe@samba.org> | 2005-04-06 23:22:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:28 -0500 |
| commit | c46c6e23ba7b962e20f49eeff3c3842ce905ec4a (patch) | |
| tree | d2d43c9dde13dd2e3f0fd6df1f84f784ce5d29eb /source4 | |
| parent | 6d0c1be1a4d52f7214dd7aedfe0ea639402fc18e (diff) | |
| download | samba-c46c6e23ba7b962e20f49eeff3c3842ce905ec4a.tar.gz samba-c46c6e23ba7b962e20f49eeff3c3842ce905ec4a.tar.bz2 samba-c46c6e23ba7b962e20f49eeff3c3842ce905ec4a.zip | |
r6229: Back out these changes ...
(This used to be commit 321fbae51267153102e47845736f2c3a5abfe0be)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_schannel.c | 16 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_search.c | 2 |
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; } |