Merge master

diff --git a/configure.ac b/configure.ac
index 27a1eea8e8e1062281e264312e60b0074de35aea..bf0b3c2be83922e837d6d619eab21242963e9aad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,6 +286,7 @@ dnl --------------------------------------------------------------------------
 dnl Last minute substitutions
 dnl --------------------------------------------------------------------------
 
+dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu
 AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
 

diff --git a/distrib/initscripts/rc.afpd.netbsd.tmpl b/distrib/initscripts/rc.afpd.netbsd.tmpl
index 6242d88c868f1f835b9a01336ad7fccf47f54855..672c2ede2f5f1bc9ba44acf7378da2e7e9c5b6d6 100644 (file)
--- a/distrib/initscripts/rc.afpd.netbsd.tmpl
+++ b/distrib/initscripts/rc.afpd.netbsd.tmpl
@@ -17,6 +17,7 @@ rcvar=$name
 command=":SBINDIR:/afpd"
 etcdir=":ETCDIR:"
 pidfile="/var/run/${name}.pid"
+command_args="-P ${pidfile}"
 required_files="$etcdir/afpd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system"
 
 load_rc_config $name

diff --git a/distrib/initscripts/service.atalk.systemd.tmpl b/distrib/initscripts/service.atalk.systemd.tmpl
index 1af8576758b732d436ac2f4c4162005cec6de6ff..794baa5694663ecd44101180cd11d4e0890791b0 100644 (file)
--- a/distrib/initscripts/service.atalk.systemd.tmpl
+++ b/distrib/initscripts/service.atalk.systemd.tmpl
@@ -6,7 +6,7 @@
 
 [Unit]
 Description=File and Printer sharing for Macintosh clients
-After=syslog.target network.target
+After=syslog.target network.target slpd.service avahi-daemon.service
 
 [Service]
 Type=oneshot

diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
index df685e4a0b2df3bb8246a80ddcde156591708306..351e00190c9912c118eb592a0a2c3a22578c338c 100644 (file)
--- a/etc/afpd/afp_avahi.c
+++ b/etc/afpd/afp_avahi.c
@@ -12,6 +12,7 @@
 #ifdef HAVE_AVAHI
 
 #include <unistd.h>
+#include <time.h>
 
 #include <avahi-common/strlst.h>
 

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 4464434116eb695eada997272d92d1cffb207a5e..256c91a56676a535c4e428ff9f16b23f117d3317 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -626,6 +626,9 @@ static void show_version_extended(void )
        puts( "No" );
 #endif
 
+       printf( "            EA support:\t" );
+       puts( EA_MODULES );
+
        printf( "           ACL support:\t" );
 #ifdef HAVE_ACLS
        puts( "Yes" );
@@ -633,9 +636,6 @@ static void show_version_extended(void )
        puts( "No" );
 #endif
 
-       printf( "            EA support:\t" );
-       puts( EA_MODULES );
-
        printf( "          LDAP support:\t" );
 #ifdef HAVE_LDAP
        puts( "Yes" );

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 01b4d2ec130f8fcb72bd8e691e76dbb4eecd0770..87d2503544dc81e76660b6398fbf764e6aaafcc9 100644 (file)
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -603,6 +603,8 @@ int fce_set_events(const char *events)
     }
 
     free(e);
+
+    return AFP_OK;
 }
 
 #ifdef FCE_TEST_MAIN

diff --git a/etc/afpd/fce_util.c b/etc/afpd/fce_util.c
index 8523aa48683d0eef0b7121da6953da3c41828eb7..672adac82d9be151e8ba5d552ad2877cb7fd338a 100644 (file)
--- a/etc/afpd/fce_util.c
+++ b/etc/afpd/fce_util.c
@@ -193,6 +193,8 @@ int fce_set_coalesce(char *opt)
     }
 
     free(e);
+
+    return AFP_OK;
 }
 
 

diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c
index 113f30c9bf0f130b122ce732c7c03f3b1c639bff..8c50dcf804cf0f3ea304bc84c55a2d3610cfe579 100644 (file)
--- a/libatalk/adouble/ad_sendfile.c
+++ b/libatalk/adouble/ad_sendfile.c
@@ -59,7 +59,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
 #elif defined(SENDFILE_FLAVOR_BSD )
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/uio.h><
+#include <sys/uio.h>
 ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
 {
   return sendfile(fromfd, tofd, *offset, count, NULL, offset, 0);

diff --git a/libatalk/compat/misc.c b/libatalk/compat/misc.c
index dc4869e7d6735c085be56a2453a8c59182fc00ec..0bd45a7318c871ab34c442ebc8fdaf4cad6c9cc7 100644 (file)
--- a/libatalk/compat/misc.c
+++ b/libatalk/compat/misc.c
@@ -8,6 +8,6 @@
 #include <dirent.h>
 int dirfd(DIR *dir)
 {
-    return dir->dd_fd;
+    return dir->d_fd;
 }
 #endif

diff --git a/libatalk/compat/rquota_xdr.c b/libatalk/compat/rquota_xdr.c
index 15e1ff3de028070d7d440fcf97ab3040de88747a..5aa27a42b667718116c966319764e1d8b896ca77 100644 (file)
--- a/libatalk/compat/rquota_xdr.c
+++ b/libatalk/compat/rquota_xdr.c
@@ -20,8 +20,7 @@
        solaris
        linux libc5
 */
-#if defined(NEED_RQUOTA) || (defined(sun) && defined(__svr4__)) || \
-(defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 6)
+#if defined(NEED_RQUOTA) || defined(SOLARIS) || (defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 6)
 
 #ifndef u_int
 #define u_int unsigned

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index e06a6ac41621e7a24df08527d86d4a60b18f4b51..4b136177b25b21620740aba4f432b26effcca2e7 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -293,6 +293,8 @@ if test x"$this_os" = "xsolaris"; then
        AC_DEFINE(_ISOC9X_SOURCE, 1, [Compatibility macro])
        AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
        AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro])
+    AC_DEFINE(_XOPEN_SOURCE, 600, [Solaris compilation environment])
+    AC_DEFINE(__EXTENSIONS__,  1, [Solaris compilation environment])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
        need_dash_r=yes
        sysv_style=solaris