Rev 5332: 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: 5332
revision-id: ma at sernet.de-20070404210735-a7ec9596051e209d
parent: ma at sernet.de-20070404063804-c3fb1cd2076aad55
parent: metze at samba.org-20070404170028-29a134ylofakzwtl
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-04 23:07:35 +0200
message:
  merge from upstream
modified:
  REVISION                       REVISION-20060530022625-68239662668b41c3
  source/libads/sasl.c           sasl.c-20060530022627-de2e2050d01ecfd2
  source/utils/smbpasswd.c       smbpasswd.c-20060530022628-991ec5b2d7d6c4b9
    ------------------------------------------------------------
    merged: metze at samba.org-20070404170028-29a134ylofakzwtl
    parent: abartlet at samba.org-20070404110154-qnszr0fl2i4g0e7x
    committer: metze at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-04 12:00:28 -0500
    message:
      metze at samba.org (r22078)  2007-04-04 09:50:39 -0500 (Wed, 04 Apr 2007)
          
          fix memory leak in not often used code, we only use it if the server
          doesn't support GSS-SPNEGO in SASL
          
          can someone please review this, maybe it's also for 3.0.25
          
          metze
    ------------------------------------------------------------
    merged: abartlet at samba.org-20070404110154-qnszr0fl2i4g0e7x
    parent: jerry at samba.org-20070404051204-prfugr38wzis92hz
    committer: abartlet at samba.org
    branch nick: SAMBA_3_0.bzr
    timestamp: Wed 2007-04-04 06:01:54 -0500
    message:
      abartlet at samba.org (r22071)  2007-04-04 01:03:54 -0500 (Wed, 04 Apr 2007)
          
          Make the error message for incorrect use of '-c' show the parameter as used.
          
          This means that smbpasswd -c user (which in htpasswd creates a new file)
          and smbpasswd -c /not/my/smb.conf should give errors an admin will
          think to chase down.
          
          Andrew Bartlett
          
=== modified file 'REVISION'
--- a/REVISION	2007-04-04 05:12:04 +0000
+++ b/REVISION	2007-04-04 17:00:28 +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: 22069
+Revision: 22078
 Node Kind: directory
-Last Changed Author: jerry
-Last Changed Rev: 22069
-Last Changed Date: 2007-04-03 23:28:28 -0500 (Tue, 03 Apr 2007)
+Last Changed Author: metze
+Last Changed Rev: 22078
+Last Changed Date: 2007-04-04 09:50:39 -0500 (Wed, 04 Apr 2007)
 

=== modified file 'source/libads/sasl.c'
--- a/source/libads/sasl.c	2007-03-15 23:14:31 +0000
+++ b/source/libads/sasl.c	2007-04-04 17:00:28 +0000
@@ -301,7 +301,7 @@
 	uint32 minor_status;
 	gss_name_t serv_name;
 	gss_buffer_desc input_name;
-	gss_ctx_id_t context_handle;
+	gss_ctx_id_t context_handle = GSS_C_NO_CONTEXT;
 	gss_OID mech_type = GSS_C_NULL_OID;
 	gss_buffer_desc output_token, input_token;
 	uint32 ret_flags, conf_state;
@@ -368,8 +368,6 @@
 		return ADS_ERROR_GSS(gss_rc, minor_status);
 	}
 
-	context_handle = GSS_C_NO_CONTEXT;
-
 	input_token.value = NULL;
 	input_token.length = 0;
 
@@ -478,6 +476,8 @@
 failed:
 
 	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);
 	krb5_free_principal(ctx, principal);
 	krb5_free_context(ctx);	
 

=== modified file 'source/utils/smbpasswd.c'
--- a/source/utils/smbpasswd.c	2007-03-11 17:02:04 +0000
+++ b/source/utils/smbpasswd.c	2007-04-04 11:01:54 +0000
@@ -190,7 +190,7 @@
 
 	if (!lp_load(configfile,True,False,False,True)) {
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
-			dyn_CONFIGFILE);
+			configfile);
 		exit(1);
 	}