net: allow "net idmap get ranges" to list all ranges
authorMichael Adam <obnox@samba.org>
Tue, 1 Oct 2013 22:43:27 +0000 (00:43 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 2 Oct 2013 10:23:33 +0000 (12:23 +0200)
Omission of SID parameter lists ranges for all domains.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Oct  2 12:23:33 CEST 2013 on sn-devel-104

source3/utils/net_idmap.c

index 663831227705f99fe580cb94683d63921c11cd65..de2d50975bb6d317104928844a50d8e1b60a4861 100644 (file)
@@ -1175,9 +1175,9 @@ static void net_idmap_autorid_get_ranges_usage(void)
 {
        d_printf("%s\n%s",
                 _("Usage:"),
-                _("net idmap get ranges <SID> [--db=<inputfile>]\n"
+                _("net idmap get ranges [<SID>] [--db=<inputfile>]\n"
                   "  Get all ranges for a given domain.\n"
-                  "    SID\t\tSID of the domain\n"
+                  "    SID\t\tSID of the domain - list all ranges if omitted\n"
                   "    inputfile\tTDB file to add mapping to.\n"));
 }
 
@@ -1195,13 +1195,15 @@ static int net_idmap_autorid_get_ranges(struct net_context *c, int argc,
                return 0;
        }
 
-       if (argc != 1) {
+       if (argc == 0) {
+               domsid = NULL;
+       } else if (argc == 1) {
+               domsid = argv[0];
+       } else {
                net_idmap_autorid_get_ranges_usage();
                return -1;
        }
 
-       domsid = argv[0];
-
        mem_ctx = talloc_stackframe();
        if (!net_idmap_opendb_autorid(mem_ctx, c, true, &db)) {
                goto done;