--- a/src/configfile.h	Tue Jun 13 07:31:43 2000 +0100
+++ b/src/configfile.h	Tue Jun 13 07:34:25 2000 +0100
@@ -3,7 +3,7 @@
 
   Common declarations and handling of the configuration file.
 
-  $Id: configfile.h 100 2000-05-18 12:17:23Z bears $
+  $Id: configfile.h 143 2000-06-13 06:34:25Z bears $
 */
 
 #ifndef CONFIGFILE_H
@@ -31,7 +31,6 @@
 
 Bool Cfg_replaceMsgId( void );
 Bool Cfg_postLocal( void );
-const char * Cfg_autoSubscribeMode( void ); /* Can be: full, thread, over */
 const char * Cfg_mailTo( void );
 
 /* Begin iteration through the server names */
@@ -47,15 +46,17 @@
 Bool Cfg_servIsPreferential( const char *name1, const char *name2 );
 void Cfg_authInfo( const char *name, Str user, Str pass );
 
-/* Begin iteration through expire entries. */
-void Cfg_beginExpireEnum( void );
-
-/* Put next expire pattern in "pattern" and return its days count.
-   Return -1 if no more expire patterns. */
-int Cfg_nextExpire( Str pattern );
+/* Return expire period for named group. */
+int Cfg_expire( const char *grp );
 
 /* Return default expire days. */
-int Cfg_expire( void );
+int Cfg_defaultExpire( void );
+
+/* Return auto subscribe mode for named group. Can be: full, thread, over */
+const char * Cfg_autoSubscribeMode( const char *grp );
+
+/* Return default auto subscribe mode. Can be: full, thread, over */
+const char * Cfg_defaultAutoSubscribeMode( void );
 
 void Cfg_read( void );