diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-03 10:50:53 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-03 10:50:53 +0100 |
| commit | 7dd0cd26d32980d4edb9db5c77c98a2b112e24cb (patch) | |
| tree | 025dad49b789c0e9f2eb03d87ec386295630b3f0 /source4/ntvfs/posix/pvfs_open.c | |
| parent | 80e9b72e018fb7d7f2cd5ff383e4a533b4ccc705 (diff) | |
| parent | 4d4a898742a0439d3f60c84194b02901412f4679 (diff) | |
| download | samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.tar.gz samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.tar.bz2 samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/Makefile
source/build/smb_build/makefile.pm
source/librpc/config.mk
(This used to be commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_open.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 740a0a9d13..adf4c1ac18 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -144,8 +144,8 @@ static NTSTATUS pvfs_open_setup_eas_acl(struct pvfs_state *pvfs, form the lock context used for opendb locking. Note that we must zero here to take account of possible padding on some architectures */ -static NTSTATUS pvfs_locking_key(struct pvfs_filename *name, - TALLOC_CTX *mem_ctx, DATA_BLOB *key) +NTSTATUS pvfs_locking_key(struct pvfs_filename *name, + TALLOC_CTX *mem_ctx, DATA_BLOB *key) { struct { dev_t device; |