[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  0852b0f s4:param/pyparam_util.c - remove unused include
       via  cc553ea s4:auth/gensec/gensec_gssapi.c - always print error messages on the same talloc context
      from  7025087 wintest: cope with the heimdal version of kinit

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0852b0f65397d8e93172b00383104ce12fe02afd
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Nov 29 12:03:53 2010 +0100

    s4:param/pyparam_util.c - remove unused include
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Mon Nov 29 12:56:12 CET 2010 on sn-devel-104

commit cc553eaf97f0466a89d43a12f9cb843cfa1379fb
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Nov 29 11:33:04 2010 +0100

    s4:auth/gensec/gensec_gssapi.c - always print error messages on the same talloc context

-----------------------------------------------------------------------

Summary of changes:
 source4/auth/gensec/gensec_gssapi.c |    4 ++--
 source4/param/pyparam_util.c        |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index f0da54d..e807f77 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -583,12 +583,12 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
 			case KRB5_KDC_UNREACH:
 				DEBUG(3, ("Cannot reach a KDC we require in order to obtain a ticetk to %s: %s\n",
 					  gensec_gssapi_state->target_principal,
-					  gssapi_error_string(gensec_gssapi_state, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
+					  gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
 				return NT_STATUS_NO_LOGON_SERVERS; /* Make SPNEGO ignore us, we can't go any further here */
 			case KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN:
 				DEBUG(3, ("Server %s is not registered with our KDC: %s\n",
 					  gensec_gssapi_state->target_principal,
-					  gssapi_error_string(gensec_gssapi_state, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
+					  gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
 				return NT_STATUS_INVALID_PARAMETER; /* Make SPNEGO ignore us, we can't go any further here */
 			case KRB5KRB_AP_ERR_MSG_TYPE:
 				/* garbage input, possibly from the auto-mech detection */
diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c
index 57a9b1b..5781cb8 100644
--- a/source4/param/pyparam_util.c
+++ b/source4/param/pyparam_util.c
@@ -22,7 +22,6 @@
 #include "param/param.h"
 #include "param/loadparm.h"
 #include "lib/talloc/pytalloc.h"
-#include "lib/cmdline/popt_common.h"
 
 #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)
 


-- 
Samba Shared Repository