diff --git a/lib/gssapi/import_name.c b/lib/gssapi/import_name.c
index 89c0a13a9..f60d70418 100644
--- a/lib/gssapi/import_name.c
+++ b/lib/gssapi/import_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -44,8 +44,10 @@ import_krb5_name (OM_uint32 *minor_status,
     char *tmp;
 
     tmp = malloc (input_name_buffer->length + 1);
-    if (tmp == NULL)
+    if (tmp == NULL) {
+	*minor_status = ENOMEM;
 	return GSS_S_FAILURE;
+    }
     memcpy (tmp,
 	    input_name_buffer->value,
 	    input_name_buffer->length);
@@ -57,10 +59,13 @@ import_krb5_name (OM_uint32 *minor_status,
     free (tmp);
     if (kerr == 0)
 	return GSS_S_COMPLETE;
-    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED)
+    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) {
+	*minor_status = kerr;
 	return GSS_S_BAD_NAME;
-    else
+    } else {
+	*minor_status = kerr;
 	return GSS_S_FAILURE;
+    }
 }
 
 static OM_uint32
@@ -106,10 +111,13 @@ import_hostbased_name (OM_uint32 *minor_status,
     *minor_status = kerr;
     if (kerr == 0)
 	return GSS_S_COMPLETE;
-    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) 
+    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) {
+	*minor_status = kerr;
 	return GSS_S_BAD_NAME;
-    else
+    } else {
+	*minor_status = kerr;
 	return GSS_S_FAILURE;
+    }
 }
 
 OM_uint32 gss_import_name
@@ -132,6 +140,8 @@ OM_uint32 gss_import_name
 	return import_krb5_name (minor_status,
 				 input_name_buffer,
 				 output_name);
-    else
+    else {
+	*minor_status = 0;
 	return GSS_S_BAD_NAMETYPE;
+    }
 }
diff --git a/lib/gssapi/krb5/import_name.c b/lib/gssapi/krb5/import_name.c
index 89c0a13a9..f60d70418 100644
--- a/lib/gssapi/krb5/import_name.c
+++ b/lib/gssapi/krb5/import_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -44,8 +44,10 @@ import_krb5_name (OM_uint32 *minor_status,
     char *tmp;
 
     tmp = malloc (input_name_buffer->length + 1);
-    if (tmp == NULL)
+    if (tmp == NULL) {
+	*minor_status = ENOMEM;
 	return GSS_S_FAILURE;
+    }
     memcpy (tmp,
 	    input_name_buffer->value,
 	    input_name_buffer->length);
@@ -57,10 +59,13 @@ import_krb5_name (OM_uint32 *minor_status,
     free (tmp);
     if (kerr == 0)
 	return GSS_S_COMPLETE;
-    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED)
+    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) {
+	*minor_status = kerr;
 	return GSS_S_BAD_NAME;
-    else
+    } else {
+	*minor_status = kerr;
 	return GSS_S_FAILURE;
+    }
 }
 
 static OM_uint32
@@ -106,10 +111,13 @@ import_hostbased_name (OM_uint32 *minor_status,
     *minor_status = kerr;
     if (kerr == 0)
 	return GSS_S_COMPLETE;
-    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) 
+    else if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED) {
+	*minor_status = kerr;
 	return GSS_S_BAD_NAME;
-    else
+    } else {
+	*minor_status = kerr;
 	return GSS_S_FAILURE;
+    }
 }
 
 OM_uint32 gss_import_name
@@ -132,6 +140,8 @@ OM_uint32 gss_import_name
 	return import_krb5_name (minor_status,
 				 input_name_buffer,
 				 output_name);
-    else
+    else {
+	*minor_status = 0;
 	return GSS_S_BAD_NAMETYPE;
+    }
 }