Rev 5336: merge from upstream in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

[Michael Adam]

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

------------------------------------------------------------
revno: 5336
revision-id: ma at sernet.de-20070404231329-24fad8c3805602b0
parent: ma at sernet.de-20070404230753-b7c97663a4995a05
parent: jra at samba.org-20070404230042-yjnnzy9q2k1v747c
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Thu 2007-04-05 01:13:29 +0200
message:
  merge from upstream
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  source/libads/sasl.c           sasl.c-20060530022627-de2e2050d01ecfd2
    ------------------------------------------------------------
    merged: jra at samba.org-20070404230042-yjnnzy9q2k1v747c
    parent: metze at samba.org-20070404170028-29a134ylofakzwtl
    committer: jra at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-04 18:00:42 -0500
    message:
      jra at samba.org (r22079)  2007-04-04 12:38:12 -0500 (Wed, 04 Apr 2007)
          
          Tsk, tsk, Metze didn't compile before check-in :-).
          Merge the memory leak fix (with fix :-) to 3.0.25.
          Jeremy.
          
=== modified file 'REVISION'
--- a/REVISION	2007-04-04 17:00:28 +0000
+++ b/REVISION	2007-04-04 23:00:42 +0000
@@ -2,9 +2,9 @@
 URL: svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
 Repository Root: svn+ssh://svn.samba.org/home/svn/samba
 Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 22078
+Revision: 22079
 Node Kind: directory
-Last Changed Author: metze
-Last Changed Rev: 22078
-Last Changed Date: 2007-04-04 09:50:39 -0500 (Wed, 04 Apr 2007)
+Last Changed Author: jra
+Last Changed Rev: 22079
+Last Changed Date: 2007-04-04 12:38:12 -0500 (Wed, 04 Apr 2007)
 

=== modified file 'source/libads/sasl.c'
--- a/source/libads/sasl.c	2007-04-04 17:00:28 +0000
+++ b/source/libads/sasl.c	2007-04-04 23:00:42 +0000
@@ -477,7 +477,7 @@
 
 	gss_release_name(&minor_status, &serv_name);
 	if (context_handle != GSS_C_NO_CONTEXT)
-		gss_delete_sec_context(&min_status, &context_handle, GSS_C_NO_BUFFER);
+		gss_delete_sec_context(&minor_status, &context_handle, GSS_C_NO_BUFFER);
 	krb5_free_principal(ctx, principal);
 	krb5_free_context(ctx);