correct SASL include file locations

diff --git a/ChangeLog b/ChangeLog
index 23aacaa..e534e07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-05-18  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
+       * mts/smtp/smtp.c, uip/popsbr.c: correct SASL include file locations
+
        * docs/COMPLETION-BASH: bash completion definitions from Debian
 
        * patch #2863: savannah@brisammon.fastmail.fm: sbr/folder_read.c:

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index bf0804e..63aef40 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -18,8 +18,8 @@
 #endif
 
 #ifdef CYRUS_SASL
-#include <sasl.h>
-#include <saslutil.h>
+#include <sasl/sasl.h>
+#include <sasl/saslutil.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -502,15 +502,6 @@ rclient (char *server, char *protocol, char *service)
     return NOTOK;
 }
 
-#ifdef CYRUS_SASL
-#include <sasl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <errno.h>
-#endif /* CYRUS_SASL */
-
 int
 sm_winit (int mode, char *from)
 {

diff --git a/uip/popsbr.c b/uip/popsbr.c
index aa396fd..10d9cba 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -26,8 +26,8 @@ extern int  client(char *args, char *protocol, char *service, int rproto,
 #endif
 
 #ifdef CYRUS_SASL
-# include <sasl.h>
-# include <saslutil.h>
+# include <sasl/sasl.h>
+# include <sasl/saslutil.h>
 #endif /* CYRUS_SASL */
 
 #include <h/popsbr.h>