fix solaris compile issues, warning fixes

diff --git a/configure.in b/configure.in
index 3df8d968201d38380cdd654c904bfe94ad68a301..2a24b6c44187413b976f4755695e32a8ac3f71f8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.9 2003-10-29 23:53:23 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.10 2003-10-30 05:57:43 bfernhomberg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -56,7 +56,7 @@ dnl AC_CHECK_LIB(lwp, main)
 dnl Replace `main' with a function in -ln:
 dnl AC_CHECK_LIB(n, main)
 dnl Replace `main' with a function in -lnsl:
-AC_CHECK_LIB(nsl, socket)
+AC_CHECK_LIB(nsl, main)
 dnl Replace `main' with a function in -lprot:
 dnl AC_CHECK_LIB(prot, main)
 dnl Replace `main' with a function in -lrx:

diff --git a/etc/afpd/afprun.c b/etc/afpd/afprun.c
index 4517d6094b47cb7abb2dbd274fabca587ecd8198..a811b8ff54f52e5c6a65cd46dfdfd3917d09ada6 100644 (file)
--- a/etc/afpd/afprun.c
+++ b/etc/afpd/afprun.c
@@ -40,9 +40,16 @@
 #include <sys/param.h>  
 #include <string.h>
 
+/* FIXME */
+#ifndef SOLARIS
 #ifndef USE_SETRESUID
 #define USE_SETRESUID 1
 #endif
+#else
+#ifndef USE_SETEUID
+#define USE_SETEUID 1
+#endif
+#endif
 
 #include <atalk/logger.h>
 

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 36167b279526b932e15488ef60ddecf2bd72d0e3..5a39f018b1d45556964a09ceda5f586de641be09 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.71.2.4.2.2 2003-09-28 13:58:56 didg Exp $
+ * $Id: directory.c,v 1.71.2.4.2.3 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,27 +12,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
-#include <atalk/util.h>
-#include <atalk/cnid.h>
-#include <utime.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dirent.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <grp.h>
-#include <pwd.h>
-
 /* STDC check */
 #if STDC_HEADERS
 #include <string.h>
@@ -47,6 +26,29 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#include <utime.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <dirent.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
+#include <grp.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/param.h>
+#include <netatalk/endian.h>
+#include <atalk/adouble.h>
+#include <atalk/afp.h>
+#include <atalk/util.h>
+#include <atalk/cnid.h>
+#include <atalk/logger.h>
 
 #include "directory.h"
 #include "desktop.h"
@@ -56,7 +58,6 @@ char *strchr (), *strrchr ();
 #include "filedir.h"
 #include "globals.h"
 #include "unix.h"
-
 #include "mangle.h"
 
 struct dir     *curdir;

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 7a6dbd5f8c68ca8fbb30275d37af295dbae25c43..2bf4e61f2523fe318df62fae5f74b4923ec4ab49 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.45.2.2.2.2 2003-09-28 13:58:57 didg Exp $
+ * $Id: filedir.c,v 1.45.2.2.2.3 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -9,23 +9,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <errno.h>
-#include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
-#include <atalk/util.h>
-#include <atalk/cnid.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <dirent.h>
-
 /* STDC check */
 #if STDC_HEADERS
 #include <string.h>
@@ -40,10 +25,26 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#include <dirent.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <netatalk/endian.h>
+#include <atalk/adouble.h>
+#include <atalk/afp.h>
+#include <atalk/util.h>
+#include <atalk/cnid.h>
+#include <atalk/logger.h>
 
 #include "directory.h"
 #include "desktop.h"

diff --git a/etc/afpd/messages.c b/etc/afpd/messages.c
index a0da511c30a19cede6ce9bd24cfd7fc5f9be89bc..edeadcb487ac6dfa5ca6b7532fb96a4d8a406edb 100644 (file)
--- a/etc/afpd/messages.c
+++ b/etc/afpd/messages.c
@@ -1,5 +1,5 @@
 /*
- * $Id: messages.c,v 1.16.6.1.2.2 2003-09-11 23:36:44 bfernhomberg Exp $
+ * $Id: messages.c,v 1.16.6.1.2.3 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -9,6 +9,9 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -16,16 +19,9 @@
 #include <atalk/afp.h>
 #include <atalk/dsi.h>
 #include <atalk/logger.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <atalk/unicode.h>
 #include "globals.h"
 #include "misc.h"
 
-#ifndef MAX
-#define MAX(a,b)     ((a) > (b) ? (a) : (b))
-#endif /* ! MAX */
 
 #define MAXMESGSIZE 199
 

diff --git a/etc/afpd/nfsquota.c b/etc/afpd/nfsquota.c
index 61a4b8ec435cedbf37cbd449240f8078556bec33..63679aa596e6384bfd2fa329605d2e13841121ba 100644 (file)
--- a/etc/afpd/nfsquota.c
+++ b/etc/afpd/nfsquota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nfsquota.c,v 1.10 2002-08-29 17:22:06 jmarcus Exp $
+ * $Id: nfsquota.c,v 1.10.8.1 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * parts of this are lifted from the bsd quota program and are
  * therefore under the following copyright:
@@ -34,22 +34,24 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h> /* for DEV_BSIZE */
 #include <sys/time.h>  /* <rpc/rpc.h> on ultrix doesn't include this */
-#include <atalk/logger.h>
-
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
 #include <netinet/in.h>
+#ifndef PORTMAP
+#define PORTMAP 1
+#endif
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpcsvc/rquota.h>
 
+
 #include <atalk/afp.h>
+#include <atalk/logger.h>
 
 #include "unix.h"
 

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index 4dc30d793a3d1601adc5948f8757a133dd8e60fa..4a7ab912110f89733e523793c0ad8ad4d0a7c7cb 100644 (file)
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: quota.c,v 1.22.8.4 2003-09-24 11:29:13 bfernhomberg Exp $
+ * $Id: quota.c,v 1.22.8.5 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -28,7 +28,6 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
-
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>
@@ -38,15 +37,15 @@ char *strchr (), *strrchr ();
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
-#include <atalk/logger.h>
 
+#include <atalk/logger.h>
 #include <atalk/afp.h>
 
 #include "auth.h"
 #include "volume.h"
 #include "unix.h"
 
-#define DEBUG_QUOTA 1
+#define DEBUG_QUOTA 0
 #define WANT_USER_QUOTA 0
 #define WANT_GROUP_QUOTA 1
 

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 8c22d752df85663972570eb4dfa6b06792246dd1..f7f9194cf3767070574e48458e2d5e9f3c81b9b2 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.43.2.1 2003-07-21 05:50:54 didg Exp $
+ * $Id: unix.c,v 1.43.2.1.2.1 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,16 +12,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atalk/logger.h>
-#include <netatalk/endian.h>
-#include <dirent.h>
-#include <limits.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
 /* STDC check */
 #ifdef STDC_HEADERS
 #include <string.h>
@@ -36,10 +26,19 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
-
+#include <errno.h>
+#include <dirent.h>
+#include <limits.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <netatalk/endian.h>
+#include <atalk/logger.h>
+#include <atalk/adouble.h>
+#include <atalk/afp.h>
 #include "auth.h"
 #include "directory.h"
 #include "volume.h"

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 1d42b71f662da02093e4cfe5c9bec131f2db53a8..711e1f2f4f847194e6faf51a2c3833363c29f4a2 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.51.2.7.2.8 2003-10-23 04:29:16 didg Exp $
+ * $Id: volume.c,v 1.51.2.7.2.9 2003-10-30 05:57:44 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -9,31 +9,20 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <sys/time.h>
-#include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netatalk/endian.h>
-#include <atalk/asp.h>
-#include <atalk/dsi.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
-#include <atalk/util.h>
-#ifdef CNID_DB
-#include <atalk/cnid.h>
-#endif /* CNID_DB*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
 #include <dirent.h>
+#include <pwd.h>
+#include <grp.h>
+#include <utime.h>
+#include <errno.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 /* STDC check */
 #if STDC_HEADERS
 #include <string.h>
@@ -48,16 +37,28 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netatalk/endian.h>
+#include <atalk/asp.h>
+#include <atalk/dsi.h>
+#include <atalk/adouble.h>
+#include <atalk/afp.h>
+#include <atalk/util.h>
+#include <atalk/logger.h>
+#ifdef CNID_DB
+#include <atalk/cnid.h>
+#endif /* CNID_DB*/
 
-#include <pwd.h>
-#include <grp.h>
-#include <utime.h>
-#include <errno.h>
-
+#include "globals.h"
 #include "directory.h"
 #include "file.h"
 #include "volume.h"
-#include "globals.h"
 #include "unix.h"
 
 extern int afprun(int root, char *cmd, int *outfd);