r26320: Clean up properly after error.

diff --git a/source/auth/credentials/credentials.i b/source/auth/credentials/credentials.i
index 565221c466ad736671dc1a0ec452043d294bf5c1..456ea75519d8a7daef4130a9f24f6dbc17e4280f 100644 (file)
--- a/source/auth/credentials/credentials.i
+++ b/source/auth/credentials/credentials.i
@@ -50,9 +50,7 @@ typedef struct cli_credentials {
         cli_credentials() {
             return cli_credentials_init(NULL);
         }
-        ~cli_credentials() {
-            talloc_free($self);
-        }
+        ~cli_credentials() { talloc_free($self); }
         /* username */
         const char *get_username(void);
         bool set_username(const char *value, 

diff --git a/source/auth/credentials/credentials_krb5.c b/source/auth/credentials/credentials_krb5.c
index fe71d98b4336f9e8c4866926fee444ec75fab2d3..cfdc2e3f5a392e16ee36852d5d638bfd5c538fce 100644 (file)
--- a/source/auth/credentials/credentials_krb5.c
+++ b/source/auth/credentials/credentials_krb5.c
@@ -41,6 +41,7 @@ int cli_credentials_get_krb5_context(struct cli_credentials *cred,
        ret = smb_krb5_init_context(cred, cli_credentials_get_event_context(cred), 
                                    lp_ctx, &cred->smb_krb5_context);
        if (ret) {
+               cred->smb_krb5_context = NULL;
                return ret;
        }
        *smb_krb5_context = cred->smb_krb5_context;