diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-06 18:57:27 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-07 19:16:27 +0200 |
| commit | d921200e75e90fbda2cf7ba7950ae71e09c50468 (patch) | |
| tree | aad59945d8c1ee941fc22d62c2b4865513467890 /source3/torture | |
| parent | af66c64e95183647bce39754089c591cbbdfbc50 (diff) | |
| download | samba-d921200e75e90fbda2cf7ba7950ae71e09c50468.tar.gz | |
s3:libsmb: use clistr_pull_talloc() for short_name in interpret_long_filename()
metze
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/masktest.c | 3 | ||||
| -rw-r--r-- | source3/torture/torture.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c index 9bb34dfe459..6b9c302aa37 100644 --- a/source3/torture/masktest.c +++ b/source3/torture/masktest.c @@ -267,7 +267,8 @@ static NTSTATUS listfn(const char *mnt, struct file_info *f, const char *s, return NT_STATUS_OK; } - fstrcpy(state->short_name, f->short_name); + + fstrcpy(state->short_name, f->short_name ? f->short_name : ""); strlower_m(state->short_name); *state->pp_long_name = SMB_STRDUP(f->name); if (!*state->pp_long_name) { diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 64f8bf77b66..8f251b7f2bb 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -7081,13 +7081,13 @@ static NTSTATUS shortname_list_fn(const char *mnt, struct file_info *finfo, #endif if (strchr(force_shortname_chars, i)) { - if (!finfo->short_name[0]) { + if (!finfo->short_name) { /* Shortname not created when it should be. */ d_printf("(%s) ERROR: Shortname was not created for file %s containing %d\n", __location__, finfo->name, i); s->val = true; } - } else if (finfo->short_name[0]){ + } else if (finfo->short_name){ /* Shortname created when it should not be. */ d_printf("(%s) ERROR: Shortname %s was created for file %s\n", __location__, finfo->short_name, finfo->name); |