* Changed socklen_t to int (to allow compile on Macintosh)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 21d05509b5ac5a8b35ad40dd81a33987275bc6f8..9886b560439776f9d5c41cf00a1dbc22e68d8fb8 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 605.1  2003/02/19 22:38:43  ajc
+ * Changed socklen_t to int (to allow compile on Macintosh)
+
  Revision 605.0  2003/02/19 03:46:01  ajc
  * THIS IS 6.05
 
@@ -4481,3 +4484,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 783111760904df414778ea93da65c9febace1ff3..30708010d2c02b1bf47fe3b0e1d64685491e240d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -824,7 +824,7 @@ void generate_nonce(struct CitContext *con) {
  */
 void begin_session(struct CitContext *con)
 {
-       int len;
+       int len;        /* should be socklen_t but doesn't work on Macintosh */
        struct sockaddr_in sin;
 
        /* 

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index de88d33f70d09a7096097026ef65f04837b64e90..18a5dc907711da123908d9f8effdf08c7174ea52 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -129,7 +129,7 @@ int rbl_check_addr(struct in_addr *addr, char *message_to_spammer)
  */
 int rbl_check(char *message_to_spammer) {
        struct sockaddr_in sin;
-       socklen_t len;
+       int len;        /* should be socklen_t but doesn't work on Macintosh */
 
        if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, &len)) {
                return(rbl_check_addr(&sin.sin_addr, message_to_spammer));