Merge branch 'master' into next

[paraslash.git] / send_common.c

diff --git a/send_common.c b/send_common.c
index d14080c..388fde0 100644 (file)
--- a/send_common.c
+++ b/send_common.c
@@ -6,7 +6,10 @@
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 

+#include <regex.h>

 #include <dirent.h>
 #include <dirent.h>

+#include <osl.h>
+

 #include "para.h"
 #include "error.h"
 #include "string.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"


@@ -389,8 +392,9 @@ char *generic_sender_help(void)
 {
        return make_message(
                "usage: {on|off}\n"
 {
        return make_message(
                "usage: {on|off}\n"

-               "usage: {allow|deny} IP mask\n"
-               "example: allow 127.0.0.1 32\n"
+               "usage: {allow|deny} IP[/netmask]\n"
+               "       where mask defaults to 32\n"
+               "example: allow 192.168.0.1/24\n"

        );
 }
 
        );
 }