Merge from branch-2-1

diff --git a/distrib/initscripts/.gitignore b/distrib/initscripts/.gitignore
index f6892ccad217240df3141d61dbfdff552869e766..3ed4c80ccd2682d80ededfe1d7a0c95a27df61c4 100644 (file)
--- a/distrib/initscripts/.gitignore
+++ b/distrib/initscripts/.gitignore
@@ -4,6 +4,8 @@ rc.atalk.bsd
 rc.atalk.redhat
 rc.atalk.suse
 rc.atalk.tru64
+rc.atalk.sysv
+netatalk
 atalk
 .gitignore
 *.o

diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index 88036d6e6caf530158703705bf1a129bba17deb5..90d3e3627ec02459fca16673aa2aa02cbf2aeb9d 100644 (file)
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -1295,8 +1295,8 @@ int ad_open( const char *path, int adflags, int oflags, int mode, struct adouble
                 if (ad->ad_data_fork.adf_fd == -1 && errno == OPEN_NOFOLLOW_ERRNO) {
                     int lsz;
 
-                    ad->ad_data_fork.adf_syml = malloc(PATH_MAX+1);
-                    lsz = readlink(path, ad->ad_data_fork.adf_syml, PATH_MAX);
+                    ad->ad_data_fork.adf_syml = malloc(MAXPATHLEN+1);
+                    lsz = readlink(path, ad->ad_data_fork.adf_syml, MAXPATHLEN);
                     if (lsz <= 0) {
                         free(ad->ad_data_fork.adf_syml);
                         return -1;

diff --git a/macros/gssapi-check.m4 b/macros/gssapi-check.m4
index 15fecfe54d77ae74efe141147428432aac4c5f17..045ac03ef1a342a41998fcf7c3fa7e074c141493 100644 (file)
--- a/macros/gssapi-check.m4
+++ b/macros/gssapi-check.m4
@@ -109,6 +109,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK],
 
        AC_CHECK_LIB(gssapi, gss_display_status) 
        AC_CHECK_LIB(gssapi_krb5, gss_display_status) 
+       AC_CHECK_LIB(gss, gss_display_status) 
 
        # check for functions