[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  18879da Changing log level of two entries to DBG_NOTICE
       via  d5cdfa0 backupkey: Fix CID 1338078 (RESOURCE_LEAK)
      from  4f84372 notifyd: Do not include CTDB headers without CLUSTER_SUPPORT enabled

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


- Log -----------------------------------------------------------------
commit 18879dab9affffd79a647a4de697512c03e04425
Author: Marc Muehlfeld <mmuehlfeld at samba.org>
Date:   Tue Nov 3 10:09:13 2015 +0100

    Changing log level of two entries to DBG_NOTICE
    
    On domain members using RFC2307, machine acccounts without an uidNumber
    attribute are not retrieved via idmap_ad. This leads to many of the following
    two error messages:
       Username DOMAIN\machineaccountname$ is invalid on this system
    and
       Failed to map kerberos principal to system user (NT_STATUS_LOGON_FAILURE)
    Machine accounts don't have an uidNumber attribute, if not set manually. To
    avoid flooding the logs, setting message from debug level 1 to DBG_NOTICE.
    
    Bugreport: https://bugzilla.samba.org/show_bug.cgi?id=9912
    
    Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Nov  4 00:46:15 CET 2015 on sn-devel-104

commit d5cdfa0f82e82b41490450571a155acfad66e85c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 3 12:00:56 2015 +0100

    backupkey: Fix CID 1338078 (RESOURCE_LEAK)
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/auth/auth_generic.c                     | 4 ++--
 source3/auth/user_krb5.c                        | 4 ++--
 source4/rpc_server/backupkey/dcesrv_backupkey.c | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index 584b52f..74eb2fa 100644
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -95,8 +95,8 @@ static NTSTATUS auth3_generate_session_info_pac(struct auth4_context *auth_ctx,
 					     &ntuser, &ntdomain,
 					     &username, &pw);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("Failed to map kerberos principal to system user "
-			  "(%s)\n", nt_errstr(status)));
+		DBG_NOTICE("Failed to map kerberos principal to system user "
+			  "(%s)\n", nt_errstr(status));
 		status = NT_STATUS_ACCESS_DENIED;
 		goto done;
 	}
diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 7442ea4..2b009ba 100644
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -160,8 +160,8 @@ NTSTATUS get_user_from_kerberos_info(TALLOC_CTX *mem_ctx,
 
 		/* extra sanity check that the guest account is valid */
 		if (!pw) {
-			DEBUG(1, ("Username %s is invalid on this system\n",
-				  fuser));
+			DBG_NOTICE("Username %s is invalid on this system\n",
+				  fuser);
 			return NT_STATUS_LOGON_FAILURE;
 		}
 	}
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 3edd1b6..ccd95d2 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -312,6 +312,7 @@ static NTSTATUS get_pk_from_raw_keypair_params(TALLOC_CTX *ctx,
 	ops = hx509_find_private_alg(&_hx509_signature_rsa_with_var_num.algorithm);
 	if (ops == NULL) {
 		DEBUG(2, ("Not supported algorithm\n"));
+		hx509_context_free(&hctx);
 		return NT_STATUS_INTERNAL_ERROR;
 	}
 


-- 
Samba Shared Repository