hal: Branch 'master'

[Danny Kukawka]

 tools/hal-acl-tool.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 98fa5d8645e4d0890ffa95c284c1a9160e1de0bc
Author: Ludwig Nussel <ludwig.nussel at suse.de>
Date:   Mon Sep 22 20:11:36 2008 -0700

    hal-acl-tool: don't free strings that are not supposed to be freed
    
    Fon't free strings that are not supposed to be freed (in hal-acl-tool).

diff --git a/tools/hal-acl-tool.c b/tools/hal-acl-tool.c
index d01a069..db17374 100644
--- a/tools/hal-acl-tool.c
+++ b/tools/hal-acl-tool.c
@@ -1085,18 +1085,12 @@ acl_reconfigure_all (void)
 
 		if (device == NULL) {
 			printf ("%d: access_control.file not set for '%s'\n", getpid (), udis[i]);
-                        if (type != NULL)
-                                libhal_free_string (type);
                         acl_for_device_free (afd);
                         goto skip;
 		}
 
 		if (type == NULL) {
 			printf ("%d: access_control.type not set for '%s'\n", getpid (), udis[i]);
-                        if (device != NULL)
-                                libhal_free_string (device);
-                        if (type != NULL)
-                                libhal_free_string (type);
                         acl_for_device_free (afd);
                         goto skip;
 		}