Merge branch 'master' of github.com:janvidar/uhub

doc/init.d.RedHat/etc/logrotator.d/uhub

@@ -0,0 +1,13 @@
+# Log rotate for Uhub 
+# see man logrotate 
+#
+#
+/var/log/uhub.log {                                                                                       
+	compress
+	size 10M
+	rotate 10
+	missingok
+	notifempty
+
+	
+}

doc/rules.txt

@@ -0,0 +1,5 @@
+1. rule #1
+2. rule #2
+3. rule #3
+......
+34. Rule #34

doc/uhub.conf

@@ -39,6 +39,11 @@ file_acl=/etc/uhub/users.conf
 # Normally this message is sent to clients when connecting.
 file_motd=/etc/uhub/motd.txt
 
+# This file can contain a rules of the hub.
+# Normally this message is sent to clients when write in chat !rules 
+file_rules=/etc/uhub/rules.txt
+
+
 # Slots\share\hubs limits
 limit_max_hubs_user = 0
 limit_max_hubs_reg = 0

src/util/timeout.c

@@ -123,4 +123,5 @@ void timeout_queue_reschedule(struct timeout_queue* t, struct timeout_evt* evt,
 	if (timeout_evt_is_scheduled(evt))
 		timeout_queue_remove(t, evt);
 	timeout_queue_insert(t, evt, seconds);
-}
+}
+