diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-13 12:02:31 +0200 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-13 12:02:31 +0200 |
| commit | 9b3871ed293f76e770e572cd6b59f59670f1f6f8 (patch) | |
| tree | 2b79286e3a6f7af9e26466393a0b26075a238be8 /source3/modules/vfs_cap.c | |
| parent | 309473f938d18b9993c2c4f120eeff7b4641985a (diff) | |
| parent | ca847952054f5bbde1d40ad4260589b6fcc9721d (diff) | |
| download | samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.tar.gz samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.tar.bz2 samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/modules/vfs_cap.c')
| -rw-r--r-- | source3/modules/vfs_cap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 7edbb8783c..35fa740dd0 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -695,12 +695,13 @@ static char *capdecode(TALLOC_CTX *ctx, const char *from) size_t len = 0; for (p1 = from; *p1; len++) { - if (is_hex(from)) { + if (is_hex(p1)) { p1 += 3; } else { p1++; } } + len++; to = TALLOC_ARRAY(ctx, char, len); if (!to) { |