diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/smbd/filename.c | |
parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
download | samba-4.0.0alpha16.tar.gz samba-4.0.0alpha16.tar.xz samba-4.0.0alpha16.zip |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16samba-4.0.0alpha16
Diffstat (limited to 'source3/smbd/filename.c')
-rw-r--r-- | source3/smbd/filename.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 08bc79dfd22..ec8d1139faa 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -163,11 +163,11 @@ static NTSTATUS check_parent_exists(TALLOC_CTX *ctx, * last compnent to shorten the tree walk. */ /* - * Safe to use CONST_DISCARD + * Safe to use discard_const_p * here as last_component points * into our smb_fname->base_name. */ - *pp_start = CONST_DISCARD(char *,last_component); + *pp_start = discard_const_p(char, last_component); /* Update dirpath. */ TALLOC_FREE(*pp_dirpath); |