Fixed a null pointer deref.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 9170a2f2b752c118e937099a1fa38e116a4015d1..22e107d62be9b746b379b9b551317bed28095a3a 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2010 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -215,6 +215,9 @@ struct config {
   /** @brief Maximum refresh interval for web interface (seconds) */
   long refresh;
 
   /** @brief Maximum refresh interval for web interface (seconds) */
   long refresh;
 

+  /** @brief Minimum refresh interval for web interface (seconds) */
+  long refresh_min;
+

   /** @brief Facilities restricted to trusted users
    *
    * A bitmap of @ref RESTRICT_SCRATCH, @ref RESTRICT_REMOVE and @ref
   /** @brief Facilities restricted to trusted users
    *
    * A bitmap of @ref RESTRICT_SCRATCH, @ref RESTRICT_REMOVE and @ref


@@ -287,7 +290,10 @@ struct config {
 
   /** @brief Maximum bias */
   long new_bias;
 
   /** @brief Maximum bias */
   long new_bias;

-  
+
+  /** @brief Rescan on (un)mount */
+  int mount_rescan;
+

   /* derived values: */
   int nparts;                          /* number of distinct name parts */
   char **parts;                                /* name part list  */
   /* derived values: */
   int nparts;                          /* number of distinct name parts */
   char **parts;                                /* name part list  */


@@ -320,6 +326,8 @@ char *config_usersysconf(const struct passwd *pw );
 char *config_private(void);
 /* get the private config file */
 
 char *config_private(void);
 /* get the private config file */
 

+int config_verify(void);
+

 extern char *configfile;
 extern int config_per_user;
 
 extern char *configfile;
 extern int config_per_user;