[srm-cvs] CVS Update: - FreeBSD compatability fixes

Date: Tue Feb 19 19:42:51 CET 2002
User: Derick Rethans
Directory: srm/modules/auth

Log Message:
 [1.00]
 - FreeBSD compatability fixes
 
Modified files:
           srm/srm.ini (version: 1.28)
           srm/main/src/srm_compat.c (version: 1.15)
           srm/main/src/srm_value.h (version: 1.49)
           srm/modules/auth/auth_parse.c (version: 1.12)
           srm/modules/auth/srm_auth.h (version: 1.8)

[FILE: /srm/srm.ini]

--- srm/srm.ini:1.27 Sun Feb 10 13:48:11 2002 GMT
+++ srm/srm.ini Tue Feb 19 17:42:49 2002 GMT
@@ -18,9 +18,9 @@
 
 modules {
     path = "/usr/local/srm/lib/";
- load "auth";
- load "http";
- load "php4";
+# load "auth";
+# load "http";
+# load "php4";
 }
 
 srm {

[FILE: /srm/main/src/srm_compat.c]

--- srm/main/src/srm_compat.c:1.14 Mon Jan 14 18:53:52 2002 GMT
+++ srm/main/src/srm_compat.c Tue Feb 19 17:42:50 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.14 2002/01/14 19:53:52 peter Exp $ */
+/* $Id: cvstemp,v 1.15 2002/02/19 18:42:50 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -17,18 +17,20 @@
  * 2000, 2001, 2002 Vulcan Logic Group. All Rights Reserved.
  *
  * Contributor(s):
+ * Derick Rethans <d.rethans@jdimedia.nl>
  */
 
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <netinet/in.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/socket.h> /* needed for MacOSX */
 #include <sys/un.h>
 #include <netdb.h>
+#include <unistd.h>
 
 #include "srm_modules.h"
 #include "srm_config.h"
@@ -39,14 +41,14 @@
         struct hostent* host;
         char* temp;
 
- host = gethostbyaddr ((char *) addr, sizeof (struct in_addr), AF_INET);
+ host = gethostbyaddr ((char *) addr, sizeof (addr), AF_INET);
         if (NULL == host) {
                 temp = malloc (16);
                 sprintf (temp, "%d.%d.%d.%d",
- (ntohl (addr->s_addr) >> 24) & 0xFF,
- (ntohl (addr->s_addr) >> 16) & 0xFF,
- (ntohl (addr->s_addr) >> 8) & 0xFF,
- ntohl (addr->s_addr) & 0xFF
+ (int) (ntohl (addr->s_addr) >> 24) & 0xFF,
+ (int) (ntohl (addr->s_addr) >> 16) & 0xFF,
+ (int) (ntohl (addr->s_addr) >> 8) & 0xFF,
+ (int) ntohl (addr->s_addr) & 0xFF
                 );
         } else {
                 temp = strdup (host->h_name);

[FILE: /srm/main/src/srm_value.h]

--- srm/main/src/srm_value.h:1.48 Sun Feb 10 18:54:28 2002 GMT
+++ srm/main/src/srm_value.h Tue Feb 19 17:42:50 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.48 2002/02/10 19:54:28 sterling Exp $ */
+/* $Id: cvstemp,v 1.49 2002/02/19 18:42:50 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -36,12 +36,6 @@
 
 #define SRM_SUCCESS 1
 #define SRM_FAILED 0
-/* }}} */
-
-/* {{{ Sizes */
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647
-#endif
 /* }}} */
 
 /* {{{ Protocol types */

[FILE: /srm/modules/auth/auth_parse.c]

--- srm/modules/auth/auth_parse.c:1.11 Mon Jan 14 18:54:00 2002 GMT
+++ srm/modules/auth/auth_parse.c Tue Feb 19 17:42:51 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.11 2002/01/14 19:54:00 peter Exp $ */
+/* $Id: cvstemp,v 1.12 2002/02/19 18:42:51 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -17,6 +17,7 @@
  * 2000, 2001, 2002 Vulcan Logic Group. All Rights Reserved.
  *
  * Contributor(s):
+ * Derick Rethans <d.rethans@jdimedia.nl>
  */
 
 #include <stdio.h>
@@ -35,9 +36,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "split.h"
 #include "srm_value.h"
 #include "srm_auth.h"
-#include "split.h"
 
 extern int errno;
 

[FILE: /srm/modules/auth/srm_auth.h]

--- srm/modules/auth/srm_auth.h:1.7 Mon Jan 14 18:54:00 2002 GMT
+++ srm/modules/auth/srm_auth.h Tue Feb 19 17:42:51 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.7 2002/01/14 19:54:00 peter Exp $ */
+/* $Id: cvstemp,v 1.8 2002/02/19 18:42:51 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -22,8 +22,8 @@
 #ifndef __AUTH_H__
 #define __AUTH_H__
 
-#include <pthread.h>
 #include <sys/types.h>
+#include <pthread.h>
 #include "ini_parser.h"
 #include "srm_modules.h"
 #include "functions.h"
Received on Tue Feb 19 19:42:37 2002