Changeset 22 for trunk/samba/source/libads/sasl.c

Timestamp:

Mar 25, 2007, 3:18:51 PM (14 years ago)

Author:

Yuri Dario

Message:

Source code upgrade to 3.0.25pre2.

File:

• trunk/samba/source/libads/sasl.c (modified) (5 diffs)

trunk/samba/source/libads/sasl.c

@@ -312 +312 @@
         uint8 *p;
         uint32 max_msg_size = 0;
-        char *sname;
+        char *sname = NULL;
         ADS_STATUS status;
-        krb5_principal principal;
+        krb5_principal principal = NULL;
         krb5_context ctx = NULL;
         krb5_enctype enc_types[] = {
@@ -332 +332 @@
         status = ADS_ERROR_KRB5(krb5_init_context(&ctx));
         if (!ADS_ERR_OK(status)) {
+                SAFE_FREE(sname);
                 return status;
         }
         status = ADS_ERROR_KRB5(krb5_set_default_tgs_ktypes(ctx, enc_types));
         if (!ADS_ERR_OK(status)) {
+                SAFE_FREE(sname);
+                krb5_free_context(ctx); 
                 return status;
         }
         status = ADS_ERROR_KRB5(smb_krb5_parse_name(ctx, sname, &principal));
         if (!ADS_ERR_OK(status)) {
+                SAFE_FREE(sname);
+                krb5_free_context(ctx); 
                 return status;
         }
-
-        free(sname);
-        krb5_free_context(ctx); 
 
         input_name.value = &principal;
@@ -350 +352 @@
 
         gss_rc = gss_import_name(&minor_status, &input_name, &nt_principal, &serv_name);
+
+        /*
+         * The MIT libraries have a *HORRIBLE* bug - input_value.value needs
+         * to point to the *address* of the krb5_principal, and the gss libraries
+         * to a shallow copy of the krb5_principal pointer - so we need to keep
+         * the krb5_principal around until we do the gss_release_name. MIT *SUCKS* !
+         * Just one more way in which MIT engineers screwed me over.... JRA.
+         */
+
+        SAFE_FREE(sname);
+
         if (gss_rc) {
+                krb5_free_principal(ctx, principal);
+                krb5_free_context(ctx); 
                 return ADS_ERROR_GSS(gss_rc, minor_status);
         }
@@ -408 +423 @@
         }
 
-        gss_release_name(&minor_status, &serv_name);
-
         gss_rc = gss_unwrap(&minor_status,context_handle,&input_token,&output_token,
                             (int *)&conf_state,NULL);
@@ -464 +477 @@
 
 failed:
+
+        gss_release_name(&minor_status, &serv_name);
+        krb5_free_principal(ctx, principal);
+        krb5_free_context(ctx); 
+
         if(scred)
                 ber_bvfree(scred);