0000_services.diff

diff --git a/include/balloc.h b/include/balloc.h
index 41fee0d..dfb205c 100755
--- a/include/balloc.h
+++ b/include/balloc.h
@@ -64,7 +64,7 @@ struct BlockHeap
 };
 typedef struct BlockHeap BlockHeap;
 
-struct _dlink_list heap_lists;
+extern struct _dlink_list heap_lists;
 
 extern void init_balloc(void);
 
diff --git a/include/cache.h b/include/cache.h
index 5719f27..d14884f 100755
--- a/include/cache.h
+++ b/include/cache.h
@@ -7,7 +7,7 @@
 
 struct lconn;
 
-struct BlockHeap *cacheline_heap;
+extern struct BlockHeap *cacheline_heap;
 
 struct cachefile
 {
diff --git a/include/langs.h b/include/langs.h
index 9a917da..36b2147 100755
--- a/include/langs.h
+++ b/include/langs.h
@@ -250,7 +250,7 @@ enum svc_notice_enum
 
 	/* this must be last */
 	SVC_LAST
-} svc_notice_id;
+};
 
 /* contains the string version of the enum above */
 extern const char *svc_notice_string[];
diff --git a/include/rserv.h b/include/rserv.h
index 72357c7..9ed7404 100755
--- a/include/rserv.h
+++ b/include/rserv.h
@@ -14,8 +14,8 @@
 
 #define SUSPENDREASONLEN	200
 
-int current_mark;
-int testing_conf;
+extern int current_mark;
+extern int testing_conf;
 
 extern struct timeval system_time;
 #define CURRENT_TIME system_time.tv_sec
diff --git a/include/tools.h b/include/tools.h
index ff18712..bf95761 100755
--- a/include/tools.h
+++ b/include/tools.h
@@ -26,8 +26,8 @@ time_t get_temp_time(const char *duration);
 extern const char *lcase(const char *);
 extern const char *ucase(const char *);
 
-__inline int string_to_array(char *string, char *parv[]);
-__inline int string_to_array_delim(char *string, char *parv[], char delim, int maxpara);
+int string_to_array(char *string, char *parv[]);
+int string_to_array_delim(char *string, char *parv[], char delim, int maxpara);
 
 #ifndef HAVE_STRLCAT
 extern size_t strlcat(char *dst, const char *src, size_t siz);
diff --git a/src/tools.c b/src/tools.c
index fb90298..14a9f48 100755
--- a/src/tools.c
+++ b/src/tools.c
@@ -292,7 +292,7 @@ strip_tabs(char *dest, const unsigned char *src, size_t len)
 	return dest;
 }
 
-__inline int
+int
 string_to_array(char *string, char *parv[])
 {
         char *p, *buf = string;
@@ -334,7 +334,7 @@ string_to_array(char *string, char *parv[])
         return x;
 }
 
-__inline int
+int
 string_to_array_delim(char *string, char *parv[], char delim, int maxpara)
 {
 	static char empty_string[] = "";

0001_services_parser.diff

diff --git a/src/parser.y b/src/parser.y
index 4c902bc..53962e6 100755
--- a/src/parser.y
+++ b/src/parser.y
@@ -302,9 +302,17 @@ timespec:  number string
            
                        $$ = $1 * t;
                }
-               | timespec timespec
+               | timespec number string
                {
-                       $$ = $1 + $2;
+                       time_t t;
+
+                       if ((t = conf_find_time($3)) == 0)
+                       {
+                               conf_report_error("Unrecognised time type/size '%s'", $3);
+                               t = 1;
+                       }
+
+                       $$ = $1 + $2 * t;
                }
                | timespec number
                {