X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6fc2909634fb431c65ecfa8b6db4f6519f99b389..e5afa1df87c24d49f0572ff903d4b0ee2eb803a8:/sbr/netsec.c

diff --git a/sbr/netsec.c b/sbr/netsec.c
index eb28cbac..788b23bf 100644
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -137,8 +137,9 @@ static int checkascii(const unsigned char *byte, size_t len);
 netsec_context *
 netsec_init(void)
 {
-    netsec_context *nsc = mh_xmalloc(sizeof(*nsc));
+    netsec_context *nsc;
 
+    NEW(nsc);
     nsc->ns_readfd = -1;
     nsc->ns_writefd = -1;
     nsc->ns_snoop = 0;
@@ -1001,7 +1002,7 @@ netsec_set_sasl_params(netsec_context *nsc, const char *hostname,
 	return NOTOK;
     }
 
-    nsc->sasl_hostname = getcpy(hostname);
+    nsc->sasl_hostname = mh_xstrdup(hostname);
 #else /* CYRUS_SASL */
     NMH_UNUSED(hostname);
     NMH_UNUSED(service);
@@ -1016,7 +1017,7 @@ netsec_set_sasl_params(netsec_context *nsc, const char *hostname,
 
     if (mechanism) {
 	char *p;
-	nsc->sasl_mech = getcpy(mechanism);
+	nsc->sasl_mech = mh_xstrdup(mechanism);
 
 	for (p = nsc->sasl_mech; *p; p++)
 	    if (isascii((unsigned char) *p))	/* Just in case */
@@ -1052,7 +1053,7 @@ int netsec_get_user(void *context, int id, const char **result,
 	 */
 
 	if (nsc->sasl_creds == NULL) {
-	    nsc->sasl_creds = mh_xmalloc(sizeof(*nsc->sasl_creds));
+	    NEW(nsc->sasl_creds);
 	    nsc->sasl_creds->user = NULL;
 	    nsc->sasl_creds->password = NULL;
 	}
@@ -1092,7 +1093,7 @@ netsec_get_password(sasl_conn_t *conn, void *context, int id,
 	return SASL_BADPARAM;
 
     if (nsc->sasl_creds == NULL) {
-	nsc->sasl_creds = mh_xmalloc(sizeof(*nsc->sasl_creds));
+	NEW(nsc->sasl_creds);
 	nsc->sasl_creds->user = NULL;
 	nsc->sasl_creds->password = NULL;
     }
@@ -1199,7 +1200,7 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr)
 	    return NOTOK;
 	}
 
-	nsc->sasl_chosen_mech = getcpy(nsc->sasl_mech);
+	nsc->sasl_chosen_mech = mh_xstrdup(nsc->sasl_mech);
 
 	if (mh_oauth_do_xoauth(nsc->ns_userid, nsc->oauth_service,
 			       &xoauth_client_res, &xoauth_client_res_len,