Changeset 233 for branches/samba-3.2.x/source/libads

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/libads

Files:

• kerberos.c (modified) (1 diff)
• krb5_errs.c (modified) (1 diff)
• ldap.c (modified) (2 diffs)
• ldap_printer.c (modified) (3 diffs)

branches/samba-3.2.x/source/libads/kerberos.c

@@ -536 +536 @@
   out:
 
-        if (princ) {
-                krb5_free_principal(ctx, princ);
-        }
-        if (cc) {
-                krb5_cc_close(ctx, cc);
-        }
         if (ctx) {
+                if (princ) {
+                        krb5_free_principal(ctx, princ);
+                }
+                if (cc) {
+                        krb5_cc_close(ctx, cc);
+                }
                 krb5_free_context(ctx);
         }

branches/samba-3.2.x/source/libads/krb5_errs.c

@@ -31 +31 @@
         {KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
         {KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
-#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+        {KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
+#else /* old Heimdal releases have it with different name only in an enum: */
         {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
-        {KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
-#else 
-#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available
 #endif
         {25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7 krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */

branches/samba-3.2.x/source/libads/ldap.c

@@ -300 +300 @@
                 got_realm = True;
 
+ again:
+
         /* we need to try once with the realm name and fallback to the
            netbios domain name if we fail (if netbios has not been disabled */
@@ -350 +352 @@
 
         sitename = sitename_fetch(realm);
-
- again:
 
         DEBUG(6,("ads_find_dc: (cldap) looking for %s '%s'\n",

branches/samba-3.2.x/source/libads/ldap_printer.c

@@ -302 +302 @@
                 DEBUG(3, ("Unable to open printer %s, error is %s.\n",
                           printername, dos_errstr(result)));
+                SAFE_FREE(printername);
                 return result;
         }
         
-        if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) 
+        if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
+                SAFE_FREE(printername);
                 return WERR_NOMEM;
+        }
 
         result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSDRIVER_KEY, dsdriver_ctr);
@@ -322 +325 @@
         }
         
-        if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )
+        if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
+                SAFE_FREE(printername);
                 return WERR_NOMEM;
+        }
 
         result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSSPOOLER_KEY, dsspooler_ctr);
@@ -344 +349 @@
 
         rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
+        SAFE_FREE(printername);
 
         return result;