svn commit: samba r6229 - in branches/SAMBA_4_0/source: librpc/rpc
ntvfs/posix
sharpe at samba.org
sharpe at samba.org
Wed Apr 6 23:22:52 GMT 2005
Author: sharpe
Date: 2005-04-06 23:22:52 +0000 (Wed, 06 Apr 2005)
New Revision: 6229
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6229
Log:
Back out these changes ...
Modified:
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c 2005-04-06 22:27:55 UTC (rev 6228)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c 2005-04-06 23:22:52 UTC (rev 6229)
@@ -162,21 +162,7 @@
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,
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c 2005-04-06 22:27:55 UTC (rev 6228)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c 2005-04-06 23:22:52 UTC (rev 6229)
@@ -266,7 +266,7 @@
talloc_free(file);
}
- /*pvfs_list_hibernate(dir);*/
+ pvfs_list_hibernate(dir);
return NT_STATUS_OK;
}
More information about the samba-cvs
mailing list