diff --git a/kadmin/ank.c b/kadmin/ank.c
index 343564053..a1149f8cc 100644
--- a/kadmin/ank.c
+++ b/kadmin/ank.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/kadmin/del.c b/kadmin/del.c
index 4ed0fb0a5..2bb865a02 100644
--- a/kadmin/del.c
+++ b/kadmin/del.c
@@ -48,7 +48,10 @@ del_entry(void *opt, int argc, char **argv)
     int i;
     krb5_error_code ret;
 
-    for(i = 0; i < argc; i++)
+    for(i = 0; i < argc; i++) {
 	ret = foreach_principal(argv[i], do_del_entry, "del", NULL);
+	if (ret)
+	    break;
+    }
     return ret != 0;
 }
diff --git a/kadmin/del_enctype.c b/kadmin/del_enctype.c
index 563748db4..98783d302 100644
--- a/kadmin/del_enctype.c
+++ b/kadmin/del_enctype.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1999-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -119,5 +119,5 @@ out:
     kadm5_free_principal_ent(kadm_handle, &princ);
 out2:
     free (etypes);
-    return 0;
+    return ret != 0;
 }
diff --git a/kadmin/ext.c b/kadmin/ext.c
index 8818637fb..cb3e2464b 100644
--- a/kadmin/ext.c
+++ b/kadmin/ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -124,13 +124,16 @@ ext_keytab(struct ext_keytab_options *opt, int argc, char **argv)
 
     if(ret){
 	krb5_warn(context, ret, "krb5_kt_resolve");
-	return 0;
+	return 1;
     }
 
-    for(i = 0; i < argc; i++) 
-	foreach_principal(argv[i], do_ext_keytab, "ext", &data);
+    for(i = 0; i < argc; i++) {
+	ret = foreach_principal(argv[i], do_ext_keytab, "ext", &data);
+	if (ret)
+	    break;
+    }
 
     krb5_kt_close(context, data.keytab);
 
-    return 0;
+    return ret != 0;
 }
diff --git a/kadmin/get.c b/kadmin/get.c
index b5c3b9068..a9d626083 100644
--- a/kadmin/get.c
+++ b/kadmin/get.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/kadmin/load.c b/kadmin/load.c
index 64a78f4f5..f54050018 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -553,8 +553,7 @@ loadit(int mergep, const char *name, int argc, char **argv)
 	return 0;
     }
 
-    doit(argv[0], mergep);
-    return 0;
+    return doit(argv[0], mergep);
 }
  
 int
diff --git a/kadmin/rename.c b/kadmin/rename.c
index 479c2b132..fd8d6c2f9 100644
--- a/kadmin/rename.c
+++ b/kadmin/rename.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/kadmin/util.c b/kadmin/util.c
index a5284d773..0861246e3 100644
--- a/kadmin/util.c
+++ b/kadmin/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *