[gssproxy] 02/10: Local vs Remote cred check fixes

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

rharwood pushed a commit to branch master
in repository gssproxy.

commit 60505f66de0928e4189a0526f2c11a148f97fcfd
Author: Simo Sorce <simo(a)redhat.com&gt;
Date:   Tue Feb 28 11:58:38 2017 -0500

    Local vs Remote cred check fixes
    
    Do not check for remote cred in LOCAL_ONLY case, since we are instructed to
    specifically not check with the proxy.  However, still fall back to remote
    with cred_store, since it may simply indicate what ccache to use to store the
    remote credentials reference and not where to fetch the credential from.
    
    Related-to: #51
    Signed-off-by: Simo Sorce <simo(a)redhat.com&gt;
    [rharwood(a)redhat.com: Shrink commit message and typos]
    Reviewed-by: Robbie Harwood <rharwood(a)redhat.com&gt;
---
 proxy/src/mechglue/gpp_acquire_cred.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/proxy/src/mechglue/gpp_acquire_cred.c
b/proxy/src/mechglue/gpp_acquire_cred.c
index 277e61a..fb5bda0 100644
--- a/proxy/src/mechglue/gpp_acquire_cred.c
+++ b/proxy/src/mechglue/gpp_acquire_cred.c
@@ -120,20 +120,22 @@ OM_uint32 gssi_acquire_cred_from(OM_uint32 *minor_status,
         }
     }
 
-    in_cred_remote = calloc(1, sizeof(gssx_cred));
-    if (!in_cred_remote) {
-        maj = GSS_S_FAILURE;
-        min = ENOMEM;
-        goto done;
-    }
-    maj = gppint_retrieve_remote_creds(&min, ccache_name, NULL,
-                                       in_cred_remote);
-    if (maj == GSS_S_COMPLETE) {
-        behavior = GPP_REMOTE_ONLY;
-    } else {
-        safefree(in_cred_remote);
-        if (ccache_name) {
-            behavior = GPP_LOCAL_ONLY;
+    if (behavior != GPP_LOCAL_ONLY) {
+        in_cred_remote = calloc(1, sizeof(gssx_cred));
+        if (!in_cred_remote) {
+            maj = GSS_S_FAILURE;
+            min = ENOMEM;
+            goto done;
+        }
+        maj = gppint_retrieve_remote_creds(&min, ccache_name, NULL,
+                                           in_cred_remote);
+        if (maj == GSS_S_COMPLETE) {
+            behavior = GPP_REMOTE_FIRST;
+        } else {
+            safefree(in_cred_remote);
+            if (ccache_name) {
+                behavior = GPP_LOCAL_FIRST;
+            }
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.