s4-net: fix the dependence on command line ordering

this fixes python net commands where you use a '-' option before the
command name

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index acace9eeed193ee15bcf34b57b1c11dbcb338520..46cc07d7024290336cf0b2f5082f01916941dc60 100644 (file)
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -156,7 +156,7 @@ int net_run_function(struct net_context *ctx,
                        return functable[i].fn(ctx, argc-1, argv+1);
        }
 
-       d_printf("No command: %s\n", argv[0]);
+       d_printf("No command: '%s'\n", argv[0]);
        return usage_fn(ctx, argc, argv);
 }
 
@@ -317,13 +317,15 @@ static int binary_net(int argc, const char **argv)
                return 1;
        }
 
-       if (argc > 1) {
-               py_cmd = PyDict_GetItemString(py_cmds, argv[1]);
-               if (py_cmd != NULL) {
-                       rc = py_call_with_string_args(py_cmd, "_run",
-                               argc-1, argv+1);
-                       talloc_free(ev);
-                       return rc;
+       for (i=1; i<argc; i++) {
+               if (argv[i][0] != '-') {
+                       py_cmd = PyDict_GetItemString(py_cmds, argv[i]);
+                       if (py_cmd != NULL) {
+                               rc = py_call_with_string_args(py_cmd, "_run",
+                                                             argc-1, argv+1);
+                               talloc_free(ev);
+                               return rc;
+                       }
                }
        }