X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/90edb255effd0d29d94e662ca5bf3e9eda7ed122..bc0987627f1c80fddba89a32fbbd230f9a8fbe4d:/sbr/credentials.c

diff --git a/sbr/credentials.c b/sbr/credentials.c
index 9000e5ed..82e3c292 100644
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -1,4 +1,5 @@
-/*
+/* credentials.c -- wrap configurable access to .netrc or similar files.
+ *
  * This code is Copyright (c) 2013, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -7,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mts.h>
+#include "m_maildir.h"
 
 struct nmh_creds {
     char *host;		/* Hostname corresponding to credentials */
@@ -15,7 +17,7 @@ struct nmh_creds {
 };
 
 void
-init_credentials_file () {
+init_credentials_file(void) {
     if (credentials_file == NULL) {
         char *cred_style = context_find ("credentials");
 
@@ -38,7 +40,7 @@ init_credentials_file () {
                     credentials_file =
                         concat (mypath ? mypath : ".", "/", filename, NULL);
                     if (stat (credentials_file, &st) != OK) {
-                        admonish (NULL, "unable to find credentials file %s",
+                        inform("unable to find credentials file %s, continuing...",
                                   filename);
                     }
                 }
@@ -61,12 +63,12 @@ nmh_get_credentials (const char *host, const char *user)
 
     creds = mh_xmalloc(sizeof(*creds));
 
-    creds->host = getcpy(host);
+    creds->host = mh_xstrdup(host);
     creds->user = NULL;
     creds->pass = NULL;
 
     if (cred_style == NULL  ||  ! strcmp (cred_style, "legacy")) {
-	creds->user = user == NULL  ?  getcpy(getusername ())  :  getcpy(user);
+	creds->user = user == NULL  ?  mh_xstrdup(getusername ())  :  mh_xstrdup(user);
     } else if (! strncasecmp (cred_style, "file:", 5) ||
 	       ! strncasecmp (cred_style, "file-nopermcheck:", 17)) {
         /*
@@ -77,9 +79,9 @@ nmh_get_credentials (const char *host, const char *user)
          * 3) interactively request from user (as long as the
          *    credentials file didn't have a "default" token)
          */
-        creds->user = user == NULL ? NULL : getcpy(user);
+        creds->user = user == NULL ? NULL : mh_xstrdup(user);
     } else {
-        admonish (NULL, "unknown credentials style %s", cred_style);
+        inform("unknown credentials style %s, continuing...", cred_style);
         return NULL;
     }
 
@@ -125,11 +127,8 @@ nmh_cred_get_password(nmh_creds_t creds)
 void
 nmh_credentials_free(nmh_creds_t creds)
 {
-    if (creds->host)
-	free(creds->host);
-
-    if (creds->user)
-	free(creds->user);
+    mh_xfree(creds->host);
+    mh_xfree(creds->user);
 
     if (creds->pass) {
 	memset(creds->pass, 0, strlen(creds->pass));