Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / sbr / credentials.c

diff --git a/sbr/credentials.c b/sbr/credentials.c
index 9000e5edc6db2a574beefbd743bf16224506038b..d8e4d2e4c8563045acd2855438b6fda9585912d4 100644 (file)
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -61,12 +61,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,7 +77,7 @@ 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);
         return NULL;
@@ -125,11 +125,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));