svn commit: samba r26320 - in branches/SAMBA_4_0: . source/auth/credentials

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-06 21:39:56 +0000 (Thu, 06 Dec 2007)
New Revision: 26320

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26320

Log:
Clean up properly after error.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/credentials/credentials.i
   branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.i
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials.i	2007-12-06 21:39:49 UTC (rev 26319)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials.i	2007-12-06 21:39:56 UTC (rev 26320)
@@ -50,9 +50,7 @@
         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, 

Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c	2007-12-06 21:39:49 UTC (rev 26319)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c	2007-12-06 21:39:56 UTC (rev 26320)
@@ -41,6 +41,7 @@
 	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;