* include/mailutils/cfg.h (mu_offsetof): Move mu_offsetof to

types.hin.
* include/mailutils/types.hin (mu_offsetof): New macro.
* mailbox/acl.c (MU_S_UN_NAME): New macro.
(debug_sockaddr, mu_sockaddr_to_str, _acl_match)
(_run_entry): Take into account salen for AF_UNIX.

4 files changed, 39 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 11e2ae1ab..6690e743a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-16  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* include/mailutils/cfg.h (mu_offsetof): Move mu_offsetof to
+	types.hin.
+	* include/mailutils/types.hin (mu_offsetof): New macro.
+	* mailbox/acl.c (MU_S_UN_NAME): New macro.
+	(debug_sockaddr, mu_sockaddr_to_str, _acl_match)
+	(_run_entry): Take into account salen for AF_UNIX.
+
 2008-01-14  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* include/mailutils/gocs.h (log_facility): Remove.
diff --git a/include/mailutils/cfg.h b/include/mailutils/cfg.h
index 2e8aa3960..9431c53d0 100644
--- a/include/mailutils/cfg.h
+++ b/include/mailutils/cfg.h
@@ -135,8 +135,6 @@ struct mu_cfg_param
   const char *argname;
 };
 
-#define mu_offsetof(s,f) ((size_t)&((s*)0)->f)
-
 #define MU_TARGET_REF(f) &f, 0
 #define MU_TARGET_OFF(s,f) NULL, mu_offsetof(s,f)
 
diff --git a/include/mailutils/types.hin b/include/mailutils/types.hin
index cb53e2070..20c4eb69d 100644
--- a/include/mailutils/types.hin
+++ b/include/mailutils/types.hin
@@ -116,6 +116,8 @@ typedef struct _mu_m_server *mu_m_server_t;
 
 #define MU_FOLDER_ATTRIBUTE_ALL \
           (MU_FOLDER_ATTRIBUTE_DIRECTORY|MU_FOLDER_ATTRIBUTE_FILE)
+
+#define mu_offsetof(s,f) ((size_t)&((s*)0)->f)
   
 #ifdef __cplusplus
 }
diff --git a/mailbox/acl.c b/mailbox/acl.c
index 1d0a11af0..03710fcbe 100644
--- a/mailbox/acl.c
+++ b/mailbox/acl.c
@@ -91,8 +91,8 @@ prepare_sa (struct sockaddr *sa)
 
 int
 mu_acl_entry_create (struct _mu_acl_entry **pent,
-		    mu_acl_action_t action, void *data,
-		    struct sockaddr *sa, int salen, unsigned long netmask)
+		     mu_acl_action_t action, void *data,
+		     struct sockaddr *sa, int salen, unsigned long netmask)
 {
   struct _mu_acl_entry *p = malloc (mu_acl_entry_size (salen));
   if (!p)
@@ -307,8 +307,12 @@ mu_acl_string_to_action (const char *str, mu_acl_action_t *pres)
   return rc;
 }
 
+#define MU_S_UN_NAME(sa, salen) \
+  ((salen < mu_offsetof (struct sockaddr_un,sun_path)) ? "" : (sa)->sun_path)
+
 static void
-debug_sockaddr (mu_debug_t dbg, mu_log_level_t lvl, struct sockaddr *sa)
+debug_sockaddr (mu_debug_t dbg, mu_log_level_t lvl, struct sockaddr *sa,
+		int salen)
 {
   switch (sa->sa_family)
     {
@@ -324,7 +328,10 @@ debug_sockaddr (mu_debug_t dbg, mu_log_level_t lvl, struct sockaddr *sa)
     case AF_UNIX:
       {
 	struct sockaddr_un *s_un = (struct sockaddr_un *)sa;
-	mu_debug_printf (dbg, lvl, "{AF_UNIX %s}", s_un->sun_path);
+	if (MU_S_UN_NAME(s_un, salen)[0] == 0)
+	  mu_debug_printf (dbg, lvl, "{AF_UNIX}");
+	else
+	  mu_debug_printf (dbg, lvl, "{AF_UNIX %s}", s_un->sun_path);
 	break;
       }
 
@@ -378,14 +385,20 @@ mu_sockaddr_to_str (struct sockaddr *sa, int salen,
     case AF_UNIX:
       {
 	struct sockaddr_un *s_un = (struct sockaddr_un *)sa;
-	len += mu_stpcpy (&bufptr, &buflen, "socket ");
-	len += mu_stpcpy (&bufptr, &buflen, s_un->sun_path);
+	if (MU_S_UN_NAME(s_un, salen)[0] == 0)
+	  len += mu_stpcpy (&bufptr, &buflen, "anonymous socket");
+	else
+	  {
+	    len += mu_stpcpy (&bufptr, &buflen, "socket ");
+	    len += mu_stpcpy (&bufptr, &buflen, s_un->sun_path);
+	  }
 	break;
       }
 
     default:
       len += mu_stpcpy (&bufptr, &buflen, "{Unsupported family: ");
       len += mu_stpcpy (&bufptr, &buflen, umaxtostr (sa->sa_family, buf));
+      len += mu_stpcpy (&bufptr, &buflen, "}");
     }
   if (plen)
     *plen = len + 1;
@@ -405,7 +418,8 @@ mu_sockaddr_to_astr (struct sockaddr *sa, int salen)
 }
 
 int
-_acl_match (mu_debug_t debug, struct _mu_acl_entry *ent, struct sockaddr *sa)
+_acl_match (mu_debug_t debug, struct _mu_acl_entry *ent, struct sockaddr *sa,
+	    int salen)
 {
 #define RESMATCH(word)                                   \
   if (mu_debug_check_level (debug, MU_DEBUG_TRACE0))     \
@@ -416,9 +430,9 @@ _acl_match (mu_debug_t debug, struct _mu_acl_entry *ent, struct sockaddr *sa)
       struct in_addr a;
       
       __MU_DEBUG1 (debug, MU_DEBUG_TRACE0, "%s", "Does ");
-      debug_sockaddr (debug, MU_DEBUG_TRACE0, sa);
+      debug_sockaddr (debug, MU_DEBUG_TRACE0, sa, salen);
       mu_debug_printf (debug, MU_DEBUG_TRACE0, " match ");
-      debug_sockaddr (debug, MU_DEBUG_TRACE0, ent->sa);
+      debug_sockaddr (debug, MU_DEBUG_TRACE0, ent->sa, salen);
       a.s_addr = ent->netmask;
       a.s_addr = htonl (a.s_addr);
       mu_debug_printf (debug, MU_DEBUG_TRACE0, " netmask %s? ", inet_ntoa (a));
@@ -458,7 +472,8 @@ _acl_match (mu_debug_t debug, struct _mu_acl_entry *ent, struct sockaddr *sa)
 	struct sockaddr_un *sun_ent = (struct sockaddr_un *)ent->sa;
 	struct sockaddr_un *sun_item = (struct sockaddr_un *)sa;
 
-	if (sun_ent->sun_path[0] && sun_item->sun_path[0]
+	if (MU_S_UN_NAME (sun_ent, ent->salen)[0]
+	    && MU_S_UN_NAME (sun_item, salen)[0]
 	    && strcmp (sun_ent->sun_path, sun_item->sun_path))
 	  {
 	    RESMATCH ("no");
@@ -619,7 +634,7 @@ _run_entry (void *item, void *data)
       __MU_DEBUG2 (rp->debug, MU_DEBUG_TRACE0, "%d:%s: ", rp->idx, s);
     }
   
-  if (_acl_match (rp->debug, ent, rp->sa) == 0)
+  if (_acl_match (rp->debug, ent, rp->sa, rp->salen) == 0)
     {
       switch (ent->action)
 	{
@@ -645,7 +660,7 @@ _run_entry (void *item, void *data)
 	      }
 	    else
 	      {
-		debug_sockaddr (dbg, MU_DIAG_INFO, rp->sa);
+		debug_sockaddr (dbg, MU_DIAG_INFO, rp->sa, rp->salen);
 		mu_debug_printf (dbg, MU_DIAG_INFO, "\n");
 	      }
 	  }
@@ -707,7 +722,7 @@ mu_acl_check_sockaddr (mu_acl_t acl, struct sockaddr *sa, int salen,
   if (mu_debug_check_level (acl->debug, MU_DEBUG_TRACE0))
     {
       __MU_DEBUG1 (acl->debug, MU_DEBUG_TRACE0, "%s", "Checking sockaddr ");
-      debug_sockaddr (acl->debug, MU_DEBUG_TRACE0, r.sa);
+      debug_sockaddr (acl->debug, MU_DEBUG_TRACE0, r.sa, r.salen);
       mu_debug_printf (acl->debug, MU_DEBUG_TRACE0, "\n");
     }