diff options
| author | Gerald Carter <jerry@samba.org> | 2004-02-11 15:20:41 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-02-11 15:20:41 +0000 |
| commit | dad12f62ff1828fc4ee05cae2e2b27931e1d396b (patch) | |
| tree | 467520db66dae134f96d7d4d6e9b0ee51d40e87b | |
| parent | b11fa6146ba9f2a51d495e859357e182a18a7e84 (diff) | |
| download | samba-dad12f62ff1828fc4ee05cae2e2b27931e1d396b.tar.gz samba-dad12f62ff1828fc4ee05cae2e2b27931e1d396b.tar.bz2 samba-dad12f62ff1828fc4ee05cae2e2b27931e1d396b.zip | |
BUG 1055; patch from SATOH Fumiyasu <fumiya@miraclelinux.com>; formatting fixes for 'net share'
(This used to be commit 447d4fee6c245a5bbf0c33c8ffb0fd9041e51c24)
| -rw-r--r-- | source3/utils/net_rap.c | 7 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c index 1f6c6e7a84..39254641ab 100644 --- a/source3/utils/net_rap.c +++ b/source3/utils/net_rap.c @@ -153,14 +153,14 @@ int net_rap_share_usage(int argc, const char **argv) static void long_share_fn(const char *share_name, uint32 type, const char *comment, void *state) { - d_printf("%-12.12s %-8.8s %-50.50s\n", + d_printf("%-12s %-8.8s %-50s\n", share_name, share_type[type], comment); } static void share_fn(const char *share_name, uint32 type, const char *comment, void *state) { - d_printf("%-12.12s\n", share_name); + d_printf("%s\n", share_name); } static int rap_share_delete(int argc, const char **argv) @@ -240,8 +240,9 @@ int net_rap_share(int argc, const char **argv) "\nShare name Type Description\n"\ "---------- ---- -----------\n"); ret = cli_RNetShareEnum(cli, long_share_fn, NULL); + } else { + ret = cli_RNetShareEnum(cli, share_fn, NULL); } - ret = cli_RNetShareEnum(cli, share_fn, NULL); cli_shutdown(cli); return ret; } diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 30da32ae4e..b92d7ec81e 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1623,10 +1623,10 @@ static void display_share_info_1(SRV_SHARE_INFO_1 *info1) rpcstr_pull_unistr2_fstring(remark, &info1->info_1_str.uni_remark); if (opt_long_list_entries) { - d_printf("%-12.12s %-8.8s %-50.50s\n", + d_printf("%-12s %-8.8s %-50s\n", netname, share_type[info1->info_1.type], remark); } else { - d_printf("%-12.12s\n", netname); + d_printf("%s\n", netname); } } |