X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..1e5cdbdd102555b43fc3ffa9a45ba9e7a833c190:/sbr/oauth_prof.c

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index c51cf0a4..b5416380 100644
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -1,4 +1,6 @@
-/* This code is Copyright (c) 2014, by the authors of nmh.  See the
+/* oauth_prof.c -- OAuth 2.0 implementation for XOAUTH2 in SMTP and POP3.
+ *
+ * This code is Copyright (c) 2014, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
@@ -18,6 +20,7 @@
 
 #include <h/oauth.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 static const struct mh_oauth_service_info SERVICES[] = {
     /* https://developers.google.com/accounts/docs/OAuth2InstalledApp */
@@ -73,7 +76,7 @@ update_svc_field(char **field, const char *base_name, const char *svc)
 }
 
 /* Update all service_info fields that are overridden in profile. */
-static boolean
+static bool
 update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
 	   size_t errbuflen)
 {
@@ -82,7 +85,7 @@ update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
     if (svc->name == NULL) {                                             \
     	snprintf(errbuf, errbuflen, "%s", #name " is missing");		 \
 	errbuf[errbuflen - 1] = '\0';					 \
-        return FALSE;                                                    \
+        return false;                                                    \
     }
     update(scope);
     update(client_id);
@@ -100,10 +103,10 @@ update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
         svc->display_name = svc->name;
     }
 
-    return TRUE;
+    return true;
 }
 
-boolean
+bool
 mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
 			  char *errbuf, size_t errbuflen)
 {
@@ -114,18 +117,14 @@ mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
     svcinfo->client_secret = svcinfo->auth_endpoint = NULL;
     svcinfo->token_endpoint = svcinfo->redirect_uri = NULL;
 
-    for (i = 0; i < (int) (sizeof SERVICES / sizeof SERVICES[0]); i++) {
+    for (i = 0; i < (int)DIM(SERVICES); i++) {
         if (strcmp(SERVICES[i].name, svc_name) == 0) {
             copy_svc(svcinfo, &SERVICES[i]);
             break;
         }
     }
 
-    if (!update_svc(svcinfo, svc_name, errbuf, errbuflen)) {
-        return FALSE;
-    }
-
-    return TRUE;
+    return update_svc(svcinfo, svc_name, errbuf, errbuflen);
 }
 
 const char *