Include <mailutils/mu_auth.h>

@@ -57,6 +57,7 @@
 #include <mailutils/mutil.h>
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
+#include <mailutils/mu_auth.h>
 
 #include <argcv.h>
 

@@ -86,7 +86,7 @@
 #include <mailutils/parse822.h>
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
-
+#include <mailutils/mu_auth.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -147,6 +147,7 @@ extern int state;
 extern volatile size_t children;
 extern int is_virtual;
 extern struct daemon_param daemon_param;
+extern struct mu_auth_data *auth_data; 
 	
 #ifndef HAVE_STRTOK_R
 extern char *strtok_r __P((char *s, const char *delim, char **save_ptr));
@@ -156,7 +157,7 @@ extern char *strtok_r __P((char *s, const char *delim, char **save_ptr));
 extern int  imap4d_append __P ((struct imap4d_command *, char *));
 extern int  imap4d_append0 __P((mailbox_t mbox, int flags, char *text));
 extern int  imap4d_authenticate __P ((struct imap4d_command *, char *));
-extern int  imap4d_auth_capability __P((void));
+extern void imap4d_auth_capability __P((void));
 extern int  imap4d_capability __P ((struct imap4d_command *, char *));
 extern int  imap4d_check __P ((struct imap4d_command *, char *));
 extern int  imap4d_close __P ((struct imap4d_command *, char *));

@@ -80,13 +80,10 @@
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
 #include <mailutils/url.h>
+#include <mailutils/mu_auth.h>
 
 #include <mu_dbm.h>
 
-#ifdef HAVE_MYSQL
-# include "../MySql/MySql.h"
-#endif
-
 /* Debug */
 extern int debug_level;
 #define dbg() if (debug_level) debug
@@ -99,11 +96,12 @@ extern int debug_level;
 extern char *quotadbname;
 extern int exit_code;
 
-extern void setgroupquota (char *str);
-extern int check_quota (char *name, size_t size, size_t *rest);
+extern void setgroupquota __P((char *str));
+extern int check_quota __P((char *name, size_t size, size_t *rest));
 
-int mda (FILE *fp, char *username);
-int switch_user_id (uid_t uid);
+int mda __P((FILE *fp, char *username));
+int switch_user_id __P((uid_t uid));
+void mailer_err __P((char *fmt, ...));
 
 #ifdef WITH_GUILE
 struct mda_data

@@ -122,6 +122,7 @@
 #include <mailutils/mutil.h>
 #include <mailutils/registrar.h>
 #include <mailutils/url.h>
+#include <mailutils/mu_auth.h>
 
 /* For Berkley DB2 APOP password file */
 #ifdef HAVE_DB_H
@@ -174,6 +175,7 @@ extern FILE *ofile;
 extern char *md5shared;
 extern volatile size_t children;
 extern struct daemon_param daemon_param;
+extern int debug_mode;
 
 extern int pop3d_abquit         __P ((int));
 extern int pop3d_apop           __P ((const char *));