Fix DSI status packet, always put dirservice offset in the packet

diff --git a/NEWS b/NEWS
index 968de7369fb21e1d6fa0e0af0928d6dd9dbf7b09..2091ebdb866de6017cf83832a1a5454378221a1a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ Changes in 3.0 alpha3
 * NEW: ad: ad set subcommand for changing Mac metadata on the server
 * UPD: unix charset is UTF8 by default
        vol charset is same value as unix charset by default
+* FIX: afpd: Server info packet was malformed resulting in broken
+       server names being displayed on clients
 
 Changes in 3.0 alpha2
 =====================

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 4beb4285142b8c1fcaeb436a92e501c40166122e..55862da5a5ea5d14c456102652035feea899557c 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -363,9 +363,10 @@ static size_t status_directorynames(char *data,
     offset = ntohs(offset);
     data += offset;
 
-    char *DirectoryNamesCount = data++, *DirectoryNames = data;
-    *DirectoryNamesCount = 0;
+    char *DirectoryNamesCount = data++;
+    char *DirectoryNames = data;
     size_t size = sizeof(uint8_t);
+    *DirectoryNamesCount = 0;
 
     if (!uam_gss_enabled())
         goto offset_calc;
@@ -445,16 +446,14 @@ static size_t status_directorynames(char *data,
                          strlen(principal),
                          principal);
 
-    // XXX: should this be krb5_xfree?
-    krb5_free_unparsed_name(context, principal);
+    free(principal);
     goto krb5_cleanup;
 
 krb5_error:
     if (ret) {
         error_msg = krb5_get_error_message(context, ret);
-        LOG(log_error, logtype_afpd,
-            "status:DirectoryNames: Kerberos error: %s",
-            (char *) error_msg);
+        LOG(log_note, logtype_afpd, "Can't get principal from default keytab: %s",
+            (char *)error_msg);
         krb5_free_error_message(context, error_msg);
     }
 
@@ -479,8 +478,7 @@ krb5_cleanup:
 
 offset_calc:
     /* Calculate and store offset for UTF8ServerName */
-    if (uam_gss_enabled())
-        *diroffset += sizeof(uint16_t);
+    *diroffset += sizeof(uint16_t);
     offset = htons(data - begin);
     memcpy(begin + *diroffset, &offset, sizeof(uint16_t));
 
@@ -600,7 +598,7 @@ void status_init(AFPObj *obj, DSI *dsi)
                  options->flags & OPTION_SERVERNOTIF,
                  (options->fqdn || ipok),
                  options->passwdbits, 
-                 uam_gss_enabled(),
+                 1,
                  options->flags);
     /* returns offset to signature offset */
     c = status_server(status, options->hostname, options);