[gnome-keyring] pam: Make sure to never block SIGCHLD

[Stefan Walter <stefw src gnome org>]

commit a942c8f458e337d90101e6a81654478fda6ccfa9
Author: Clement Lefebvre <clement lefebvre linuxmint com>
Date:   Thu Mar 5 12:31:54 2015 +0100

    pam: Make sure to never block SIGCHLD
    
    Blocking this signal prevented MDM logins, as the slave
    couldn't notice the death of the greeter)
    
    Signed-off-by: Stef Walter <stefw gnome org>
     * Use goto and a single return path
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745673

 pam/gkr-pam-client.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/pam/gkr-pam-client.c b/pam/gkr-pam-client.c
index 16468dd..71766c1 100644
--- a/pam/gkr-pam-client.c
+++ b/pam/gkr-pam-client.c
@@ -419,7 +419,7 @@ gkr_pam_client_run_operation (struct passwd *pwd, const char *control,
 
        res = lookup_daemon (pwd, control, &addr);
        if (res != GKD_CONTROL_RESULT_OK)
-               return res;
+               goto out;
 
        if (pwd->pw_uid == getuid () && pwd->pw_gid == getgid () && 
            pwd->pw_uid == geteuid () && pwd->pw_gid == getegid ()) {
@@ -462,7 +462,8 @@ gkr_pam_client_run_operation (struct passwd *pwd, const char *control,
                        break;
                };
        }
-       
+
+out:
        sigaction (SIGCHLD, &oldchld, NULL);
        sigaction (SIGPIPE, &oldpipe, NULL);