Use strdup in place of malloc/strcpy in many places

ticket: 6200
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20898 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 5 insertions, 19 deletions

diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c
index f1bd93f2b..ef093e621 100644
--- a/src/lib/gssapi/generic/util_canonhost.c
+++ b/src/lib/gssapi/generic/util_canonhost.c
@@ -59,11 +59,9 @@ g_canonicalize_host(char *hostname)
 
     xfree(haddr);
 
-    if ((canon = (char *) xmalloc(strlen(hent->h_name)+1)) == NULL)
+    if ((canon = (char *) strdup(hent->h_name)) == NULL)
 	return(NULL);
 
-    strcpy(canon, hent->h_name);
-
     for (str = canon; *str; str++)
 	if (isupper(*str)) *str = tolower(*str);
 
diff --git a/src/lib/gssapi/generic/util_localhost.c b/src/lib/gssapi/generic/util_localhost.c
index 2d3c27cb2..c014400fb 100644
--- a/src/lib/gssapi/generic/util_localhost.c
+++ b/src/lib/gssapi/generic/util_localhost.c
@@ -45,8 +45,5 @@ g_local_host_name(void)
 
     buf[sizeof(buf)-1] = '\0';
 
-    if (! (ptr = xmalloc(strlen(buf) + 1)))
-	return 0;
-
-    return strcpy(ptr, buf);
+    return strdup(buf);
 }
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 64812a78b..12e553f2f 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -246,12 +246,11 @@ kg_set_ccache_name (OM_uint32 *minor_status, const char *name)
     krb5_error_code kerr;
 
     if (name) {
-        new_name = malloc(strlen(name) + 1);
+        new_name = strdup(name);
         if (new_name == NULL) {
             *minor_status = ENOMEM;
             return GSS_S_FAILURE;
         }
-        strcpy(new_name, name);
     }
 
     kg_ccache_name = k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME);
diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 78dac8a5c..cb779aa90 100644
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -358,12 +358,11 @@ gss_buffer_t outStr;
 
 	/* now copy the status code and return to caller */
 	outStr->length = strlen(errStr);
-	outStr->value = malloc((size_t)outStr->length+1);
+	outStr->value = strdup(errStr);
 	if (outStr->value == NULL) {
 		outStr->length = 0;
 		return (GSS_S_FAILURE);
 	}
 
-	(void) strcpy((char *)outStr->value, errStr);
 	return (GSS_S_COMPLETE);
 } /* displayMajor */
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index a62336139..54b9af5d1 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -2260,14 +2260,7 @@ negotiate_mech_type(OM_uint32 *minor_status,
 static spnego_token_t
 make_spnego_token(char *name)
 {
-	spnego_token_t token;
-
-	token = (spnego_token_t)malloc(strlen(name)+1);
-
-	if (token == NULL)
-		return (NULL);
-	strcpy(token, name);
-	return (token);
+	return (spnego_token_t)strdup(name);
 }
 
 static gss_buffer_desc