Make --files-from allow a missing trailing arg w/--server.
authorWayne Davison <wayned@samba.org>
Sat, 7 May 2011 19:16:12 +0000 (12:16 -0700)
committerWayne Davison <wayned@samba.org>
Sat, 7 May 2011 19:16:50 +0000 (12:16 -0700)
options.c

index 1041c97..a8c5b49 100644 (file)
--- a/options.c
+++ b/options.c
@@ -2228,7 +2228,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
        if (files_from) {
                char *h, *p;
                int q;
        if (files_from) {
                char *h, *p;
                int q;
-               if (argc > 2 || (!am_daemon && argc == 1)) {
+               if (argc > 2 || (!am_daemon && !am_server && argc == 1)) {
                        usage(FERROR);
                        exit_cleanup(RERR_SYNTAX);
                }
                        usage(FERROR);
                        exit_cleanup(RERR_SYNTAX);
                }