Don't overwrite minorStatus before printing error.

[trust_router.git] / gsscon / gsscon_passive.c

diff --git a/gsscon/gsscon_passive.c b/gsscon/gsscon_passive.c
index 262a768..f6a782b 100755 (executable)
--- a/gsscon/gsscon_passive.c
+++ b/gsscon/gsscon_passive.c
@@ -56,36 +56,37 @@
 
 const char *gServiceName = NULL;
 
-int gsscon_passive_authenticate (int           inSocket, 
-                                gss_buffer_desc inNameBuffer,
-                                gss_name_t inServiceName,
-                                gss_ctx_id_t *outGSSContext,
-                                client_cb_fn clientCb,
-                                void *clientCbData)
+int gsscon_passive_authenticate (int               inSocket, 
+                                gss_buffer_desc    inNameBuffer,
+                                gss_ctx_id_t      *outGSSContext,
+                                client_cb_fn       clientCb,
+                                void              *clientCbData)
 {
     int err = 0;
     OM_uint32 majorStatus;
-    OM_uint32 minorStatus = 0;
+    OM_uint32 minorStatus = 0, minorStatusToo = 0;
     gss_ctx_id_t gssContext = GSS_C_NO_CONTEXT;
-    gss_name_t clientName = GSS_C_NO_NAME;
+    gss_name_t clientName = GSS_C_NO_NAME, serviceName = GSS_C_NO_NAME;
     gss_cred_id_t acceptorCredentials = NULL;
     gss_buffer_desc clientDisplayName = {0, NULL};
     char *inputTokenBuffer = NULL;
     size_t inputTokenBufferLength = 0;
     gss_buffer_desc inputToken;  /* buffer received from the server */
     
+    printf("In gsscon_passive_authenticate(), inNameBuffer = %s\n", inNameBuffer.value);
+
     if (inSocket <  0 ) { err = EINVAL; }
     if (!outGSSContext) { err = EINVAL; }
 
     if (!err)
-      majorStatus = gss_import_name (&minorStatus, &inNameBuffer, (gss_OID) GSS_KRB5_NT_PRINCIPAL_NAME, &inServiceName); 
+      majorStatus = gss_import_name (&minorStatus, &inNameBuffer, (gss_OID) GSS_KRB5_NT_PRINCIPAL_NAME, &serviceName); 
     if (majorStatus != GSS_S_COMPLETE) {
-       gsscon_print_gss_errors ("gss_import_name(inServiceName)", majorStatus, minorStatus);
+       gsscon_print_gss_errors ("gss_import_name(serviceName)", majorStatus, minorStatus);
        err = minorStatus ? minorStatus : majorStatus; 
       }
 
     if (!err) {
-      majorStatus = gss_acquire_cred ( &minorStatus, inServiceName,
+      majorStatus = gss_acquire_cred ( &minorStatus, serviceName,
                                       GSS_C_INDEFINITE, GSS_C_NO_OID_SET,
                                       GSS_C_ACCEPT, &acceptorCredentials,
                                       NULL /*mechs out*/, NULL /*time out*/);
@@ -148,7 +149,7 @@ int gsscon_passive_authenticate (int           inSocket,
                 err = gsscon_write_token (inSocket, outputToken.value, outputToken.length);
                 
                 /* free the output token */
-                gss_release_buffer (&minorStatus, &outputToken);
+                gss_release_buffer (&minorStatusToo, &outputToken);
             }
         }
         
@@ -182,7 +183,7 @@ if (clientName != GSS_C_NO_NAME)
   gss_release_name(&minorStatus, &clientName);
 if (clientDisplayName.value != NULL)
   gss_release_buffer(&minorStatus, &clientDisplayName);
- gss_release_name( &minorStatus, &inServiceName);
+ gss_release_name( &minorStatus, &serviceName);
  gss_release_cred( &minorStatus, &acceptorCredentials);
         
     return err;