diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
| commit | 20796bcf57a7f5e1921dc12e0568221f985fe4f2 (patch) | |
| tree | 8f0540a602a9ea0031d656bc31c0b8bc1e91eb70 /source3/web/statuspage.c | |
| parent | 323be4a6907e4915bb76aa103bf5b868f0b459b1 (diff) | |
| parent | 1a416ff13ca7786f2e8d24c66addf00883e9cb12 (diff) | |
| download | samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.gz samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.bz2 samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
Conflicts:
source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)
Diffstat (limited to 'source3/web/statuspage.c')
| -rw-r--r-- | source3/web/statuspage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index eda53b66ab..ce24c7cddd 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -123,6 +123,7 @@ static void print_share_mode(const struct share_mode_entry *e, { char *utf8_fname; int deny_mode; + size_t converted_size; if (!is_valid_share_mode_entry(e)) { return; @@ -169,7 +170,7 @@ static void print_share_mode(const struct share_mode_entry *e, printf("NONE "); printf("</td>"); - push_utf8_allocate(&utf8_fname, fname); + push_utf8_allocate(&utf8_fname, fname, &converted_size); printf("<td>%s</td><td>%s</td></tr>\n", utf8_fname,tstring(talloc_tos(),e->time.tv_sec)); SAFE_FREE(utf8_fname); |