PolicyKit: Branch 'master'

[David Zeuthen]

 pam-polkit-console/pam-polkit-console.c |    8 ++++----
 polkitd/polkit-manager.c                |    3 ++-
 tools/polkit-grant-privilege.c          |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
diff-tree 1043f61430e1d06c0d44a4ad2146e66313f0a4ad (from accea27e3816d1685d6543094bebdfdb01499ffc)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sat Jul 29 10:42:14 2006 -0400

    Patch from Danny Kukawka <danny.kukawka at web.de> with some cleanup.s
    
    	* pam-polkit-console/pam-polkit-console.c: (pam_sm_open_session),
    	(pam_sm_close_session): fixed usage of pam_get_item() to respect
    	strict-aliasing rules
    
            * polkitd/polkit-manager.c: (polkit_manager_get_caller_info):
    	added ifdef around currently unused calling_selinux_context
    
            * tools/polkit-grant-privilege.c: (grant_complete_cb): replaced
    	libpolkit_free_context() with correct libpolkit_grant_free_context()

diff --git a/pam-polkit-console/pam-polkit-console.c b/pam-polkit-console/pam-polkit-console.c
index 9e8da11..d5748af 100644
--- a/pam-polkit-console/pam-polkit-console.c
+++ b/pam-polkit-console/pam-polkit-console.c
@@ -169,7 +169,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 
 	_pam_log (pamh, LOG_ERR, TRUE, "pam_polkit_console open_session");
 	_parse_module_args (pamh, argc, argv);
-	if(pam_get_item (pamh, PAM_USER_PROMPT, (const void **) &user_prompt) != PAM_SUCCESS) {
+	if(pam_get_item (pamh, PAM_USER_PROMPT, (const void **)(char*) &user_prompt) != PAM_SUCCESS) {
 		user_prompt = "user name: ";
 	}
 	username = NULL;
@@ -178,7 +178,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 		return PAM_SESSION_ERR;
 	}
 
-	pam_get_item(pamh, PAM_TTY, (const void**) &tty);
+	pam_get_item(pamh, PAM_TTY, (const void**)(char*) &tty);
 	if (tty == NULL || strlen (tty) == 0) {
 		_pam_log(pamh, LOG_ERR, TRUE, "TTY not defined");
 		return PAM_SESSION_ERR;
@@ -216,7 +216,7 @@ pam_sm_close_session (pam_handle_t *pamh
 
 	_pam_log (pamh, LOG_ERR, TRUE, "pam_polkit_console close_session");
 	_parse_module_args (pamh, argc, argv);
-	if (pam_get_item (pamh, PAM_USER_PROMPT, (const void **) &user_prompt) != PAM_SUCCESS) {
+	if (pam_get_item (pamh, PAM_USER_PROMPT, (const void **)(char*) &user_prompt) != PAM_SUCCESS) {
 		user_prompt = "user name: ";
 	}
 	username = NULL;
@@ -225,7 +225,7 @@ pam_sm_close_session (pam_handle_t *pamh
 		return PAM_SESSION_ERR;
 	}
 
-	pam_get_item (pamh, PAM_TTY, (const void**) &tty);
+	pam_get_item (pamh, PAM_TTY, (const void**)(char*) &tty);
 	if (tty == NULL || strlen (tty) == 0) {
 		_pam_log(pamh, LOG_ERR, TRUE, "TTY not defined");
 		return PAM_SESSION_ERR;
diff --git a/polkitd/polkit-manager.c b/polkitd/polkit-manager.c
index c1cef18..a7268f7 100644
--- a/polkitd/polkit-manager.c
+++ b/polkitd/polkit-manager.c
@@ -315,8 +315,9 @@ polkit_manager_get_caller_info (PolicyKi
 	gboolean res;
 	CallerInfo *caller_info;
 	GError *error = NULL;
+#if 0
 	GArray *calling_selinux_context;
-
+#endif
 	res = FALSE;
 
 	if (sender == NULL)
diff --git a/tools/polkit-grant-privilege.c b/tools/polkit-grant-privilege.c
index b13f34f..24b32d4 100644
--- a/tools/polkit-grant-privilege.c
+++ b/tools/polkit-grant-privilege.c
@@ -144,7 +144,7 @@ grant_complete_cb (LibPolKitGrantContext
 		libpolkit_grant_close (ctx, FALSE);
 	}
 
-	libpolkit_free_context (ctx);
+	libpolkit_grant_free_context (ctx);
 
 	exit (0);
 }