[SCM] GNU Mailutils branch, master, updated. release-2.2-675-g1ec3df9

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=1ec3df9a5798322d511d88100dd046a67b8cf38b

The branch, master has been updated
       via  1ec3df9a5798322d511d88100dd046a67b8cf38b (commit)
      from  e8bc2682289c3e78dc29dd1ec833a654b6b03186 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ec3df9a5798322d511d88100dd046a67b8cf38b
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Feb 26 23:51:02 2014 +0200

    Fix compilation without gnutls
    
    * imap4d/imap4d.c [WITH_TLS] (cb_tls_required): Conditional compilation.
    * imap4d/imap4d.h [!WITH_TLS] (tls_encryption_on): Empty define.
    * pop3d/pop3d.c [!WITH_TLS] (tls_available): Empty define.
    * libmu_scm/mu_mailbox.c (mu_scm_mailbox_print): Fix format string.

-----------------------------------------------------------------------

Summary of changes:
 imap4d/imap4d.c                   |    2 ++
 imap4d/imap4d.h                   |    2 ++
 libmailutils/mailbox/biffnotify.c |    4 +---
 libmu_scm/mu_mailbox.c            |    2 +-
 libproto/mailer/smtp_auth.c       |    2 +-
 pop3d/pop3d.c                     |    4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 5cec2ec..6ce0864 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -284,6 +284,7 @@ cb_tls (void *data, mu_config_value_t *val)
 }
 #endif
 
+#ifdef WITH_TLS
 static int
 cb_tls_required (void *data, mu_config_value_t *val)
 {
@@ -307,6 +308,7 @@ cb_tls_required (void *data, mu_config_value_t *val)
     
   return 0;
 }
+#endif
 
 static mu_list_t auth_deny_user_list, auth_allow_user_list;
 static mu_list_t auth_deny_group_list, auth_allow_group_list;
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index 341277f..2d5b36c 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -339,6 +339,8 @@ extern int  imap4d_starttls (struct imap4d_session *,
                             struct imap4d_command *, imap4d_tokbuf_t);
 extern void starttls_init (void);
 void tls_encryption_on (struct imap4d_session *);
+#else
+# define tls_encryption_on(s)
 #endif /* WITH_TLS */
 extern int  imap4d_status (struct imap4d_session *,
                           struct imap4d_command *, imap4d_tokbuf_t);
diff --git a/libmailutils/mailbox/biffnotify.c 
b/libmailutils/mailbox/biffnotify.c
index 8b2cf27..2a3bdd7 100644
--- a/libmailutils/mailbox/biffnotify.c
+++ b/libmailutils/mailbox/biffnotify.c
@@ -95,7 +95,7 @@ biff_notify (mu_observer_t obs, size_t type, void *data, void 
*action_data)
        {
          sendto (fd, buf, strlen (buf), 0,
                  mbox->notify_sa, sizeof (struct sockaddr_in));
-         //FIXME: on error?
+         /*FIXME: on error?*/
          free (buf);
        }
     }
@@ -110,8 +110,6 @@ mu_mailbox_set_notify (mu_mailbox_t mbox, const char *user)
 
   if (!mbox)
     return EINVAL;
-  //  if (!(mbox->flags & MU_STREAM_APPEND))
-  //    return EACCES;
 
   if (user)
     user = strdup (user);
diff --git a/libmu_scm/mu_mailbox.c b/libmu_scm/mu_mailbox.c
index f6800d8..b720a22 100644
--- a/libmu_scm/mu_mailbox.c
+++ b/libmu_scm/mu_mailbox.c
@@ -81,7 +81,7 @@ mu_scm_mailbox_print (SCM mailbox_smob, SCM port, 
scm_print_state * pstate)
          
          scm_puts (p, port);
          
-         snprintf (buf, sizeof (buf), " (%d)", count);
+         snprintf (buf, sizeof (buf), " (%lu)", (unsigned long) count);
          scm_puts (buf, port);
        }
       else
diff --git a/libproto/mailer/smtp_auth.c b/libproto/mailer/smtp_auth.c
index 329801b..6081d2c 100644
--- a/libproto/mailer/smtp_auth.c
+++ b/libproto/mailer/smtp_auth.c
@@ -131,7 +131,7 @@ mu_smtp_auth (mu_smtp_t smtp)
 #else
   /* FIXME: Provide support for some basic authentication methods.
      Once done, make sure _mu_smtp_fixup_params is called for this
-     branc as well (though see the fixme above). */
+     branch as well (though see the fixme above). */
   return ENOSYS;
 #endif
 }
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c
index 7992da7..a94ada6 100644
--- a/pop3d/pop3d.c
+++ b/pop3d/pop3d.c
@@ -42,6 +42,8 @@ enum tls_mode tls_mode;
 #ifdef WITH_TLS
 int tls_available;
 int tls_done;
+#else
+# define tls_available 0
 #endif /* WITH_TLS */
 
 int initial_state = AUTHORIZATION; 
@@ -172,7 +174,6 @@ cb_tls (void *data, mu_config_value_t *val)
     mu_error (_("not a valid tls keyword: %s"), val->v.string);
   return 0;
 }
-#endif
 
 static int
 cb_tls_required (void *data, mu_config_value_t *val)
@@ -197,6 +198,7 @@ cb_tls_required (void *data, mu_config_value_t *val)
 
   return 0;
 }
+#endif
 
 static struct mu_cfg_param pop3d_srv_param[] = {
 #ifdef WITH_TLS


hooks/post-receive
-- 
GNU Mailutils