From 9a0bd5e080983ad54bbbd96170b2f9be6167214a Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 21 Nov 2012 18:05:22 -0500
Subject: krb5_child style fix

Use the standard 'done' label for exceptions.
---
 src/providers/krb5/krb5_child.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 66e22f43..0532a9b0 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -1085,7 +1085,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
     if (kr->pd->authtok_type != SSS_AUTHTOK_TYPE_PASSWORD) {
         pam_status = PAM_CRED_INSUFFICIENT;
         kerr = KRB5KRB_ERR_GENERIC;
-        goto sendresponse;
+        goto done;
     }
 
     pass_str = talloc_strndup(kr, (const char *) kr->pd->authtok,
@@ -1093,7 +1093,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
     if (pass_str == NULL) {
         DEBUG(1, ("talloc_strndup failed.\n"));
         kerr = KRB5KRB_ERR_GENERIC;
-        goto sendresponse;
+        goto done;
     }
 
     if (kr->pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM) {
@@ -1104,7 +1104,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
     kerr = get_changepw_options(kr->ctx, &chagepw_options);
     if (kerr != 0) {
         DEBUG(SSSDBG_OP_FAILURE, ("get_changepw_options failed.\n"));
-        goto sendresponse;
+        goto done;
     }
 
     sss_krb5_princ_realm(kr->ctx, kr->princ, &realm_name, &realm_length);
@@ -1118,7 +1118,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
     sss_krb5_get_init_creds_opt_free(kr->ctx, chagepw_options);
     if (kerr != 0) {
         pam_status = kerr_handle_error(kerr);
-        goto sendresponse;
+        goto done;
     }
 
     memset(pass_str, 0, kr->pd->authtok_size);
@@ -1131,7 +1131,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
                "successful.\n"));
         krb5_free_cred_contents(kr->ctx, kr->creds);
         pam_status = PAM_SUCCESS;
-        goto sendresponse;
+        goto done;
     }
 
     newpass_str = talloc_strndup(kr, (const char *) kr->pd->newauthtok,
@@ -1139,7 +1139,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
     if (newpass_str == NULL) {
         DEBUG(1, ("talloc_strndup failed.\n"));
         kerr = KRB5KRB_ERR_GENERIC;
-        goto sendresponse;
+        goto done;
     }
 
     memset(&result_code_string, 0, sizeof(krb5_data));
@@ -1149,7 +1149,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
 
     if (kerr == KRB5_KDC_UNREACH) {
         pam_status = PAM_AUTHTOK_LOCK_BUSY;
-        goto sendresponse;
+        goto done;
     }
 
     if (kerr != 0 || result_code != 0) {
@@ -1195,7 +1195,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
         }
 
         pam_status = PAM_AUTHTOK_ERR;
-        goto sendresponse;
+        goto done;
     }
 
     krb5_free_cred_contents(kr->ctx, kr->creds);
@@ -1207,7 +1207,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
 
     pam_status = kerr_to_status(kerr);
 
-sendresponse:
+done:
     ret = sendresponse(fd, kerr, pam_status, kr);
     if (ret != EOK) {
         DEBUG(1, ("sendresponse failed.\n"));
@@ -1230,7 +1230,7 @@ static errno_t tgt_req_child(int fd, struct krb5_req *kr)
         DEBUG(SSSDBG_OP_FAILURE, ("Unknown authtok type\n"));
         pam_status = PAM_CRED_INSUFFICIENT;
         kerr = KRB5KRB_ERR_GENERIC;
-        goto sendresponse;
+        goto done;
     }
 
     pass_str = talloc_strndup(kr, (const char *) kr->pd->authtok,
@@ -1238,7 +1238,7 @@ static errno_t tgt_req_child(int fd, struct krb5_req *kr)
     if (pass_str == NULL) {
         DEBUG(1, ("talloc_strndup failed.\n"));
         kerr = KRB5KRB_ERR_GENERIC;
-        goto sendresponse;
+        goto done;
     }
 
     kerr = get_and_save_tgt(kr, pass_str);
@@ -1260,7 +1260,7 @@ static errno_t tgt_req_child(int fd, struct krb5_req *kr)
         kerr = get_changepw_options(kr->ctx, &chagepw_options);
         if (kerr != 0) {
             DEBUG(SSSDBG_OP_FAILURE, ("get_changepw_options failed.\n"));
-            goto sendresponse;
+            goto done;
         }
 
         kerr = krb5_get_init_creds_password(kr->ctx, kr->creds, kr->princ,
@@ -1282,7 +1282,7 @@ static errno_t tgt_req_child(int fd, struct krb5_req *kr)
 
     pam_status = kerr_to_status(kerr);
 
-sendresponse:
+done:
     ret = sendresponse(fd, kerr, pam_status, kr);
     if (ret != EOK) {
         DEBUG(1, ("sendresponse failed.\n"));
-- 
cgit