Merge branch-2-1

diff --git a/NEWS b/NEWS
index f5740490e2e79ebb7ad24f4445f3122a388615db..3a604367daac1bfe7e030cd8e92ef80d774438c7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,7 @@ Changes in 2.1.6
 * FIX: afpd: Fix for LDAP user cache corruption
 * FIX: gentoo: cannot set $CNID_CONFIG
 * FIX: ubuntu: servername was empty
+* UPD: afpd: return version info with machine type in DSIGetStatus
 
 Changes in 2.1.5
 ================

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 2203d257b65d953fe3fb65c27dca8a63de463dfc..8147a038bc687e65787b3cd092b35c06c715bae5 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -133,15 +133,19 @@ static void status_machine(char *data)
 #ifdef AFS
     const char         *machine = "afs";
 #else /* !AFS */
-    const char         *machine = "Netatalk";
+    const char         *machine = "Netatalk %s";
 #endif /* AFS */
+    char buf[64];
 
     memcpy(&status, start + AFPSTATUS_MACHOFF, sizeof(status));
     data += ntohs( status );
-    len = strlen( machine );
+
+    //    len = strlen( machine );
+    len = snprintf(buf, 64, machine, VERSION);
     *data++ = len;
-    memcpy( data, machine, len );
+    memcpy( data, buf, len );
     data += len;
+
     status = htons(data - start);
     memcpy(start + AFPSTATUS_VERSOFF, &status, sizeof(status));
 }