diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-04-10 20:18:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:11 -0500 |
| commit | ac193579e7db00c7a2ea0aadaaf0d34c10dcf1a5 (patch) | |
| tree | bcd9a0afdc2996df4a56479932b7d36d32c50f8d /source4/ntvfs/cifs | |
| parent | 91b30df39bfaec8bfa32be40a13fd62008f66b9e (diff) | |
| download | samba-ac193579e7db00c7a2ea0aadaaf0d34c10dcf1a5.tar.gz samba-ac193579e7db00c7a2ea0aadaaf0d34c10dcf1a5.tar.bz2 samba-ac193579e7db00c7a2ea0aadaaf0d34c10dcf1a5.zip | |
r152: a quick airport commit ....
added ldbedit, a _really_ useful command
added ldbadd, ldbdel, ldbsearch and ldbmodify to build
solved lots of timezone issues, we now pass the torture tests with
client and server in different zones
fixed several build issues
I know this breaks the no-LDAP build. Wait till I arrive in San Jose for that
fix.
(This used to be commit af34710d4da1841653624fe304b1c8d812c0fdd9)
Diffstat (limited to 'source4/ntvfs/cifs')
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 966a670677..2a87d59a06 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -145,14 +145,15 @@ static NTSTATUS cvfs_connect(struct request_context *req, const char *sharename) private->map_calls = talloc_strdup(conn->mem_ctx, map_calls); } - /* if we are mapping trans2, then we need to not give a trans2 + /* if we are mapping trans2, then we need to give a trans2 pointer in the operations structure */ if (private->map_calls && in_list("trans2", private->map_calls, True)) { struct ntvfs_ops *ops = talloc_memdup(conn->mem_ctx,conn->ntvfs_ops,sizeof(*ops)); + static NTSTATUS cvfs_trans2(struct request_context *,struct smb_trans2 *); if (!ops) { return NT_STATUS_NO_MEMORY; } - ops->trans2 = NULL; + ops->trans2 = cvfs_trans2; conn->ntvfs_ops = ops; } @@ -725,10 +726,10 @@ NTSTATUS ntvfs_cifs_init(void) ops.trans = cvfs_trans; /* only define this one for trans2 testing */ - ops.trans2 = cvfs_trans2; - - /* register ourselves with the NTVFS subsystem. We register under the name 'cifs'. */ + ops.trans2 = NULL; + /* register ourselves with the NTVFS subsystem. We register + under the name 'cifs'. */ ret = register_backend("ntvfs", &ops); if (!NT_STATUS_IS_OK(ret)) { |