Attachment 17480 Details for Bug 15145 – patch from master

[patch] patch from master

0001-s3-utils-remove-documentation-of-l-as-alias-for-long.patch (text/plain), 7.11 KB, created by Christian Ambach on 2022-08-17 11:57:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2022-08-17 11:57:44 UTC

Size: 7.11 KB

patch

obsolete

>From 2fce2aa78339d42a9bafac8860f739f1584e2573 Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Mon, 15 Aug 2022 23:30:23 +0200
>Subject: [PATCH] s3:utils remove documentation of -l as alias for --long
>
>This was removed in 94fc9ca4c506468ab1907d501c0964d67b9d963c, so remove it from
>the usage output and manpage.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15145
>
>Signed-off-by: Christian Ambach <ambi@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Wed Aug 17 07:14:21 UTC 2022 on sn-devel-184
>
>(cherry picked from commit 123f1c07c41b40de6a9d53599d3d9a42f1a5e92b)
>---
> docs-xml/manpages/net.8.xml   | 14 +++++++-------
> source3/utils/net_usershare.c | 16 ++++++++--------
> 2 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
>index 557cf0d0883..497a8114057 100644
>--- a/docs-xml/manpages/net.8.xml
>+++ b/docs-xml/manpages/net.8.xml
>@@ -118,7 +118,7 @@
> 		</varlistentry>
> 
> 		<varlistentry>
>-		<term>-l|--long</term>
>+		<term>--long</term>
> 		<listitem><para>
> 		When listing data, give more information on each item.
> 		</para></listitem>
>@@ -2139,8 +2139,8 @@ can create user defined shares on demand using the commands below.
> <simplelist>
> <member>net usershare add sharename path [comment [acl] [guest_ok=[y|n]]] - to add or change a user defined share.</member>
> <member>net usershare delete sharename - to delete a user defined share.</member>
>-<member>net usershare info [-l|--long] [wildcard sharename] - to print info about a user defined share.</member>
>-<member>net usershare list [-l|--long] [wildcard sharename] - to list user defined shares.</member>
>+<member>net usershare info [--long] [wildcard sharename] - to print info about a user defined share.</member>
>+<member>net usershare list [--long] [wildcard sharename] - to list user defined shares.</member>
> </simplelist>
> 
> </para>
>@@ -2209,7 +2209,7 @@ any users currently connected to the deleted share.
> </refsect3>
> 
> <refsect3>
>-<title>USERSHARE INFO <replaceable>[-l|--long]</replaceable> <replaceable>[wildcard sharename]</replaceable></title>
>+<title>USERSHARE INFO <replaceable>[--long]</replaceable> <replaceable>[wildcard sharename]</replaceable></title>
> 
> <para>
> Get info on user defined shares owned by the current user matching the given pattern, or all users.
>@@ -2219,7 +2219,7 @@ Get info on user defined shares owned by the current user matching the given pat
> net usershare info on its own dumps out info on the user defined shares that were
> created by the current user, or restricts them to share names that match the given
> wildcard pattern ('*' matches one or more characters, '?' matches only one character).
>-If the '-l' or '--long' option is also given, it prints out info on user defined
>+If the '--long' option is also given, it prints out info on user defined
> shares created by other users.
> </para>
> 
>@@ -2239,7 +2239,7 @@ modified by the "net usershare add" command.
> </refsect3>
> 
> <refsect3>
>-<title>USERSHARE LIST <replaceable>[-l|--long]</replaceable> <replaceable>wildcard sharename</replaceable></title>
>+<title>USERSHARE LIST <replaceable>[--long]</replaceable> <replaceable>wildcard sharename</replaceable></title>
> 
> <para>
> List all the user defined shares owned by the current user matching the given pattern, or all users.
>@@ -2249,7 +2249,7 @@ List all the user defined shares owned by the current user matching the given pa
> net usershare list on its own list out the names of the user defined shares that were
> created by the current user, or restricts the list to share names that match the given
> wildcard pattern ('*' matches one or more characters, '?' matches only one character).
>-If the '-l' or '--long' option is also given, it includes the names of user defined
>+If the '--long' option is also given, it includes the names of user defined
> shares created by other users.
> </para>
> 
>diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
>index 50db771deb3..5e630ea5d4a 100644
>--- a/source3/utils/net_usershare.c
>+++ b/source3/utils/net_usershare.c
>@@ -70,7 +70,7 @@ static int net_usershare_add_usage(struct net_context *c, int argc, const char *
> {
> 	char chr = *lp_winbind_separator();
> 	d_printf(_(
>-		"net usershare add [-l|--long] <sharename> <path> [<comment>] [<acl>] [<guest_ok=[y|n]>]\n"
>+		"net usershare add [--long] <sharename> <path> [<comment>] [<acl>] [<guest_ok=[y|n]>]\n"
> 		"\tAdds the specified share name for this user.\n"
> 		"\t<sharename> is the new share name.\n"
> 		"\t<path> is the path on the filesystem to export.\n"
>@@ -82,7 +82,7 @@ static int net_usershare_add_usage(struct net_context *c, int argc, const char *
> 		"\t\tname may be a domain user or group. For local users use the local server name "
> 		"instead of \"DOMAIN\"\n"
> 		"\t\tThe default acl is \"Everyone:r\" which allows everyone read-only access.\n"
>-		"\tAdd -l or --long to print the info on the newly added share.\n"),
>+		"\tAdd --long to print the info on the newly added share.\n"),
> 		chr, chr );
> 	return -1;
> }
>@@ -98,10 +98,10 @@ static int net_usershare_delete_usage(struct net_context *c, int argc, const cha
> static int net_usershare_info_usage(struct net_context *c, int argc, const char **argv)
> {
> 	d_printf(_(
>-		"net usershare info [-l|--long] [wildcard sharename]\n"
>+		"net usershare info [--long] [wildcard sharename]\n"
> 		"\tPrints out the path, comment and acl elements of shares that match the wildcard.\n"
> 		"\tBy default only gives info on shares owned by the current user\n"
>-		"\tAdd -l or --long to apply this to all shares\n"
>+		"\tAdd --long to apply this to all shares\n"
> 		"\tOmit the sharename or use a wildcard of '*' to see all shares\n"));
> 	return -1;
> }
>@@ -109,10 +109,10 @@ static int net_usershare_info_usage(struct net_context *c, int argc, const char
> static int net_usershare_list_usage(struct net_context *c, int argc, const char **argv)
> {
> 	d_printf(_(
>-		"net usershare list [-l|--long] [wildcard sharename]\n"
>+		"net usershare list [--long] [wildcard sharename]\n"
> 		"\tLists the names of all shares that match the wildcard.\n"
> 		"\tBy default only lists shares owned by the current user\n"
>-		"\tAdd -l or --long to apply this to all shares\n"
>+		"\tAdd --long to apply this to all shares\n"
> 		"\tOmit the sharename or use a wildcard of '*' to see all shares\n"));
> 	return -1;
> }
>@@ -122,8 +122,8 @@ int net_usershare_usage(struct net_context *c, int argc, const char **argv)
> 	d_printf(_("net usershare add <sharename> <path> [<comment>] [<acl>] [<guest_ok=[y|n]>] to "
> 				"add or change a user defined share.\n"
> 		"net usershare delete <sharename> to delete a user defined share.\n"
>-		"net usershare info [-l|--long] [wildcard sharename] to print info about a user defined share.\n"
>-		"net usershare list [-l|--long] [wildcard sharename] to list user defined shares.\n"
>+		"net usershare info [--long] [wildcard sharename] to print info about a user defined share.\n"
>+		"net usershare list [--long] [wildcard sharename] to list user defined shares.\n"
> 		"net usershare help\n"
> 		"\nType \"net usershare help <option>\" to get more information on that option\n\n"));
> 
>-- 
>2.17.1
>

Flags:

asn: review+

Actions: View

Attachments on bug 15145: 17480