less leaks

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3833 ec53bebd-3082-4978-b11e-865c3cabbd6b

kadmin/ank.c

@@ -64,7 +64,7 @@ add_new_key(int argc, char **argv)
     int optind = 0;
     int mask = 0;
     krb5_error_code ret;
-    krb5_principal princ_ent;
+    krb5_principal princ_ent = NULL;
 
     args[0].value = &rkey;
     args[1].value = &password;
@@ -105,6 +105,8 @@ add_new_key(int argc, char **argv)
 	kadm5_free_principal_ent(kadm_handle, &princ);
     }
 out:
+    if(princ_ent)
+	krb5_free_principal(context, princ_ent);
     if(password)
 	memset(password, 0, strlen(password));
     return 0;

kadmin/kadmin.c

@@ -166,5 +166,8 @@ main(int argc, char **argv)
     if (argc != 0)
 	exit(sl_command(commands, argc, argv));
 
-    return sl_loop(commands, "kadmin> ") != 0;
+    ret = sl_loop(commands, "kadmin> ") != 0;
+    kadm5_destroy(kadm_handle);
+    krb5_free_context(context);
+    return ret;
 }

kadmin/server.c

@@ -80,9 +80,11 @@ kadmind_dispatch(void *kadm_handle, krb5_storage *sp)
 	ret = kadm5_get_principal(kadm_handle, princ, &ent, mask);
 	sp->seek(sp, 0, SEEK_SET);
 	krb5_store_int32(sp, ret);
-	if(ret == 0)
+	if(ret == 0){
 	    kadm5_store_principal_ent(sp, &ent);
 	    kadm5_free_principal_ent(kadm_handle, &ent);
+	}
+	krb5_free_principal(context->context, princ);
 	break;
     }
     case kadm_delete:{

lib/kadm5/acl.c

@@ -41,6 +41,7 @@
 RCSID("$Id$");
 
 static struct units acl_units[] = {
+    { "all",	KADM5_ACL_ALL },
     { "list",	KADM5_ACL_LIST },
     { "delete",	KADM5_ACL_DELETE },
     { "chpass",	KADM5_ACL_CHPASS },
@@ -60,8 +61,9 @@ _kadm5_acl_init(kadm5_server_context *context)
     krb5_error_code ret;
     
     krb5_parse_name(context->context, KADM5_ADMIN_SERVICE, &princ);
-    if(krb5_principal_compare(context->context, context->caller, princ)){
+    ret = krb5_principal_compare(context->context, context->caller, princ);
     krb5_free_principal(context->context, princ);
+    if(ret != 0){
 	context->acl_flags = ~0;
 	return 0;
     }

lib/kadm5/get_c.c

@@ -62,5 +62,6 @@ kadm5_c_get_principal(void *server_handle,
     ret = tmp;
     if(ret == 0)
 	kadm5_ret_principal_ent(sp, out);
+    krb5_storage_free(sp);
     return ret;
 }

lib/kadm5/init_c.c

@@ -114,6 +114,8 @@ kadm5_c_init_with_password_ctx(krb5_context context,
     ret = krb5_sendauth(context, &ctx->ac, &s, KADMIN_APPL_VERSION, NULL, 
 			server, AP_OPTS_MUTUAL_REQUIRED, 
 			NULL, NULL, cc, NULL, NULL, NULL);
+    krb5_free_principal(context, server);
+    krb5_cc_close(context, cc);
     if(ret){
 	close(s);
 	return KADM5_FAILURE;

lib/kadm5/server.c

@@ -80,9 +80,11 @@ kadmind_dispatch(void *kadm_handle, krb5_storage *sp)
 	ret = kadm5_get_principal(kadm_handle, princ, &ent, mask);
 	sp->seek(sp, 0, SEEK_SET);
 	krb5_store_int32(sp, ret);
-	if(ret == 0)
+	if(ret == 0){
 	    kadm5_store_principal_ent(sp, &ent);
 	    kadm5_free_principal_ent(kadm_handle, &ent);
+	}
+	krb5_free_principal(context->context, princ);
 	break;
     }
     case kadm_delete:{

lib/krb5/keytab.c

@@ -165,6 +165,7 @@ krb5_kt_get_entry(krb5_context context,
 	    krb5_kt_end_seq_get (context, id, &cursor);
 	    return 0;
 	}
+	krb5_kt_free_entry(context, entry);
     }
     krb5_kt_end_seq_get (context, id, &cursor);
     return KRB5_KT_NOTFOUND;

lib/krb5/sendauth.c

@@ -89,6 +89,7 @@ krb5_sendauth(krb5_context context,
     u_char repl;
     krb5_data ap_req, error_data;
     krb5_creds this_cred;
+    krb5_principal this_client = NULL;
     krb5_creds *creds;
 
     len = strlen(version) + 1;
@@ -111,9 +112,10 @@ krb5_sendauth(krb5_context context,
 
     if (in_creds == NULL) {
 	if (client == NULL) {
-      ret = krb5_cc_get_principal (context, ccache, &client);
+	    ret = krb5_cc_get_principal (context, ccache, &this_client);
 	    if (ret)
 		return ret;
+	    client = this_client;
 	}
 	memset(&this_cred, 0, sizeof(this_cred));
 	this_cred.client = client;
@@ -129,15 +131,20 @@ krb5_sendauth(krb5_context context,
     } else {
 	creds = in_creds;
     }
-  if (out_creds)
-    *out_creds = creds;
-
     ret = krb5_mk_req_extended (context,
 				auth_context,
 				ap_req_options,
 				in_data,
 				creds,
 				&ap_req);
+
+    if (out_creds)
+	*out_creds = creds;
+    else
+	krb5_free_creds(context, creds);
+    if(this_client)
+	krb5_free_principal(context, this_client);
+
     if (ret)
 	return ret;
 

lib/krb5/set_default_realm.c

@@ -73,6 +73,7 @@ krb5_set_default_realm(krb5_context context,
 	
     if (tmp == NULL)
 	return ENOMEM;
+    free(context->default_realm);
     context->default_realm = tmp;
     return 0;
 }