svn commit: samba r23136 - in branches/SAMBA_4_0/source: auth/gensec ntvfs/cifs

abartlet at samba.org abartlet at samba.org
Fri May 25 08:44:34 GMT 2007


Author: abartlet
Date: 2007-05-25 08:44:33 +0000 (Fri, 25 May 2007)
New Revision: 23136

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

Log:
Set the event context onto the credentials in more places.

This helps ensure that the kerberos code uses the right event context.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
   branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c	2007-05-25 08:14:15 UTC (rev 23135)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c	2007-05-25 08:44:33 UTC (rev 23136)
@@ -1342,6 +1342,7 @@
 			return NT_STATUS_NO_MEMORY;
 		}
 
+		cli_credentials_set_event_context(session_info->credentials, gensec_security->event_ctx);
 		cli_credentials_set_conf(session_info->credentials);
 		/* Just so we don't segfault trying to get at a username */
 		cli_credentials_set_anonymous(session_info->credentials);

Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2007-05-25 08:14:15 UTC (rev 23135)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2007-05-25 08:44:33 UTC (rev 23136)
@@ -165,6 +165,7 @@
 		if (!credentials) {
 			return NT_STATUS_NO_MEMORY;
 		}
+		cli_credentials_set_event_context(credentials, ntvfs->ctx->event_ctx);
 		cli_credentials_set_conf(credentials);
 		cli_credentials_set_username(credentials, user, CRED_SPECIFIED);
 		if (domain) {
@@ -174,6 +175,7 @@
 	} else if (machine_account) {
 		DEBUG(5, ("CIFS backend: Using machine account\n"));
 		credentials = cli_credentials_init(private);
+		cli_credentials_set_event_context(credentials, ntvfs->ctx->event_ctx);
 		cli_credentials_set_conf(credentials);
 		if (domain) {
 			cli_credentials_set_domain(credentials, domain, CRED_SPECIFIED);



More information about the samba-cvs mailing list