X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c0c8235326353f08fb3d695c601f454f32f2465c..ae8ef7d3f4cfcab63518ea97a5eb2d03f2da9b53:/sbr/credentials.c

diff --git a/sbr/credentials.c b/sbr/credentials.c
index 8dd6129a..b34b9673 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.
@@ -38,7 +39,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 +62,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 +78,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;
     }