Merge branch 'sharemodes-bug560' into branch-netatalk-3-1

diff --git a/NEWS b/NEWS
index 22b43072739b8cbc2a417e7e720ce6f1d4feea01..b38b278cfc07c798659f6af45ac7199c321c0f8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in 3.1.2
 * FIX: Option "vol dbpath" was broken in 3.1.1
 * FIX: Spotlight: file modification date, bug #545
 * FIX: Improve reliability of afpd child handler
+* FIX: debian initscript: add 0 and 6 to Default-Stop. debian-bug#745520
 * FIX: put the Solaris share reservation after our locking stuff, bug #560.
 
 Changes in 3.1.1

diff --git a/distrib/initscripts/rc.debian.tmpl b/distrib/initscripts/rc.debian.tmpl
index a0eb758f16374cc4db896637dd175d5fe7f5de96..9b26b61a5ec8c72c11e190fa2933324227adee74 100644 (file)
--- a/distrib/initscripts/rc.debian.tmpl
+++ b/distrib/initscripts/rc.debian.tmpl
@@ -5,7 +5,7 @@
 # Should-Start:      avahi-daemon
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:      0 1 6
 ### END INIT INFO
 #
 # netatalk      Netatalk :NETATALK_VERSION: initscript

diff --git a/etc/spotlight/slmod_sparql_map.c b/etc/spotlight/slmod_sparql_map.c
index 49296d799bfd1cb17119fe46708df928ba4c3b4c..c2c7312f96ef25fdd8f781e536b745372b548d29 100644 (file)
--- a/etc/spotlight/slmod_sparql_map.c
+++ b/etc/spotlight/slmod_sparql_map.c
@@ -38,6 +38,7 @@ struct spotlight_sparql_map spotlight_sparql_map[] = {
     {"kMDItemContentCreationDate",      ssmt_date,  "nie:contentCreated"},
     {"kMDItemContentModificationDate",  ssmt_date,  "nfo:fileLastModified"},
     {"kMDItemAttributeChangeDate",      ssmt_date,  "nfo:fileLastModified"},
+    {"kMDItemLastUsedDate",             ssmt_date,  "nfo:fileLastAccessed"},
     {"kMDItemAuthors",                  ssmt_str,   "dc:creator"},
     {"kMDItemCopyright",                ssmt_str,   "nie:copyright"},
     {"kMDItemCountry",                  ssmt_str,   "nco:country"},

diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 5e429a2d3df76d4f4beac1646c694036892219cb..2bb6d9f8e6c611cad306c2d6874888601a9eecfb 100644 (file)
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -580,7 +580,7 @@ static struct vol *creatvol(AFPObj *obj,
 
     strlcpy(path, path_in, MAXPATHLEN);
 
-    LOG(log_debug, logtype_afpd, "createvol(volume: '%s', path: \"%s\", preset: '%s'): BEGIN",
+    LOG(log_debug, logtype_afpd, "creatvol(volume: '%s', path: \"%s\", preset: '%s'): BEGIN",
         name, path, preset ? preset : "-");
 
     if ( name == NULL || *name == '\0' ) {
@@ -899,7 +899,7 @@ static struct vol *creatvol(AFPObj *obj,
     if ( 0 >= ( u8mvlen = convert_string(CH_UTF8_MAC, CH_UCS2, tmpname, tmpvlen, u8mtmpname, AFPVOL_U8MNAMELEN*2)) )
         EC_FAIL;
 
-    LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname);
+    LOG(log_maxdebug, logtype_afpd, "creatvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname);
 
     /* Maccharset Volume Name */
     /* Firsty convert name from unixcharset to maccharset */
@@ -937,7 +937,7 @@ static struct vol *creatvol(AFPObj *obj,
                                          AFPVOL_U8MNAMELEN*2)) )
         EC_FAIL;
 
-    LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' ->  Longname: '%s'", name, tmpname);
+    LOG(log_maxdebug, logtype_afpd, "creatvol: Volume '%s' ->  Longname: '%s'", name, tmpname);
 
     EC_NULL( volume->v_localname = strdup(name) );
     EC_NULL( volume->v_u8mname = strdup_w(u8mtmpname) );
@@ -985,7 +985,7 @@ static struct vol *creatvol(AFPObj *obj,
     volume->v_obj = obj;
 
 EC_CLEANUP:
-    LOG(log_debug, logtype_afpd, "createvol: END: %d", ret);
+    LOG(log_debug, logtype_afpd, "creatvol: END: %d", ret);
     if (dbpath)
         bdestroy(dbpath);
     if (global_path_tmp)