s3 net: Fix compile warnings

1 files changed, 28 insertions, 16 deletions

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index d17dab150d..94576d362d 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -88,7 +88,7 @@ static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
 				         "    sid\tSID of group to list");
 
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),"%s\n", list_usage_str);
+		d_printf("%s\n%s\n", _("Usage: "), list_usage_str);
 		return 0;
 	}
 
@@ -116,7 +116,7 @@ static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
 		}
 		else {
 			d_fprintf(stderr, _("Bad option: %s\n"), argv[i]);
-			d_printf(_("Usage:\n"),"%s\n", list_usage_str);
+			d_printf("%s\n%s\n", _("Usage:"), list_usage_str);
 			return -1;
 		}
 	}
@@ -192,7 +192,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 	name_type = "domain group";
 
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),"%s\n", add_usage_str);
+		d_printf("%s\n%s\n", _("Usage:\n"), add_usage_str);
 		return 0;
 	}
 
@@ -268,7 +268,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 	}
 
 	if ( !unixgrp[0] ) {
-		d_printf(_("Usage:\n"),"%s\n", add_usage_str);
+		d_printf("%s\n%s\n", _("Usage:\n"), add_usage_str);
 		return -1;
 	}
 
@@ -352,7 +352,7 @@ static int net_groupmap_modify(struct net_context *c, int argc, const char **arg
 					   "[type=<domain|local>]");
 
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),"%s\n", modify_usage_str);
+		d_printf("%s\n%s\n", _("Usage:\n"), modify_usage_str);
 		return 0;
 	}
 
@@ -408,7 +408,7 @@ static int net_groupmap_modify(struct net_context *c, int argc, const char **arg
 	}
 
 	if ( !ntgroup[0] && !sid_string[0] ) {
-		d_printf(_("Usage:\n"),"%s\n", modify_usage_str);
+		d_printf("%s\n%s\n", _("Usage:\n"), modify_usage_str);
 		return -1;
 	}
 
@@ -491,7 +491,7 @@ static int net_groupmap_delete(struct net_context *c, int argc, const char **arg
 					   "{ntgroup=<string>|sid=<SID>}");
 
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),"%s\n", delete_usage_str);
+		d_printf("%s\n%s\n", _("Usage:\n"), delete_usage_str);
 		return 0;
 	}
 
@@ -518,7 +518,7 @@ static int net_groupmap_delete(struct net_context *c, int argc, const char **arg
 	}
 
 	if ( !ntgroup[0] && !sid_string[0]) {
-		d_printf(_("Usage:\n"),"%s\n", delete_usage_str);
+		d_printf("%s\n%s\n", _("Usage:\n"), delete_usage_str);
 		return -1;
 	}
 
@@ -553,8 +553,10 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
 	bool have_map = false;
 
 	if ((argc < 1) || (argc > 2) || c->display_usage) {
-		d_printf(_("Usage:"), _(" net groupmap set \"NT Group\" "
-			 "[\"unix group\"] [-C \"comment\"] [-L] [-D]\n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _(" net groupmap set \"NT Group\" "
+			   "[\"unix group\"] [-C \"comment\"] [-L] [-D]\n"));
 		return -1;
 	}
 
@@ -669,9 +671,11 @@ static int net_groupmap_cleanup(struct net_context *c, int argc, const char **ar
 	size_t i, entries;
 
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net groupmap cleanup\n"
-			   "    ",_("Delete all group mappings\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Delete all group mappings"));
 		return 0;
 	}
 
@@ -707,7 +711,9 @@ static int net_groupmap_addmem(struct net_context *c, int argc, const char **arg
 	     c->display_usage ||
 	     !string_to_sid(&alias, argv[0]) ||
 	     !string_to_sid(&member, argv[1]) ) {
-		d_printf(_("Usage:"), _("net groupmap addmem alias-sid member-sid\n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net groupmap addmem alias-sid member-sid\n"));
 		return -1;
 	}
 
@@ -728,7 +734,9 @@ static int net_groupmap_delmem(struct net_context *c, int argc, const char **arg
 	     c->display_usage ||
 	     !string_to_sid(&alias, argv[0]) ||
 	     !string_to_sid(&member, argv[1]) ) {
-		d_printf(_("Usage:"), _(" net groupmap delmem alias-sid member-sid\n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net groupmap delmem alias-sid member-sid\n"));
 		return -1;
 	}
 
@@ -750,7 +758,9 @@ static int net_groupmap_listmem(struct net_context *c, int argc, const char **ar
 	if ( (argc != 1) ||
 	     c->display_usage ||
 	     !string_to_sid(&alias, argv[0]) ) {
-		d_printf(_("Usage:"), _(" net groupmap listmem alias-sid\n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net groupmap listmem alias-sid\n"));
 		return -1;
 	}
 
@@ -808,7 +818,9 @@ static int net_groupmap_memberships(struct net_context *c, int argc, const char
 	if ( (argc != 1) ||
 	     c->display_usage ||
 	     !string_to_sid(&member, argv[0]) ) {
-		d_printf(_("Usage:"), _(" net groupmap memberof sid\n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net groupmap memberof sid\n"));
 		return -1;
 	}