[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  6bed577 pac: Fix wrong memory allocation check
       via  c9eba24 ndr.pc: needs samba-util not samba-hostconfig
      from  b787b6e libcli/cldap: don't pass tevent_context to cldap_socket_init()

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


- Log -----------------------------------------------------------------
commit 6bed57788c2341a92e1c4431ea764bf037431254
Author: Simo Sorce <idra at samba.org>
Date:   Mon Oct 10 17:48:02 2011 -0400

    pac: Fix wrong memory allocation check
    
    Autobuild-User: Simo Sorce <idra at samba.org>
    Autobuild-Date: Tue Oct 11 01:18:22 CEST 2011 on sn-devel-104

commit c9eba24886806bca795f294183b7543e4f9376ca
Author: Simo Sorce <idra at samba.org>
Date:   Mon Oct 10 15:52:38 2011 -0400

    ndr.pc: needs samba-util not samba-hostconfig

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

Summary of changes:
 librpc/ndr.pc.in       |    2 +-
 source4/kdc/pac-glue.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr.pc.in b/librpc/ndr.pc.in
index f7a1651..1ee50cc 100644
--- a/librpc/ndr.pc.in
+++ b/librpc/ndr.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: ndr
 Description: Network Data Representation Core Library
-Requires: samba-hostconfig talloc
+Requires: samba-util talloc
 Version: 0.0.1
 Libs: @LIB_RPATH@ -L${libdir} -lndr
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index e92a511..5718452 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -51,7 +51,7 @@ NTSTATUS samba_get_logon_info_pac_blob(TALLOC_CTX *mem_ctx,
 	}
 
 	pac_info.logon_info.info = talloc_zero(mem_ctx, struct PAC_LOGON_INFO);
-	if (!mem_ctx) {
+	if (!pac_info.logon_info.info) {
 		return NT_STATUS_NO_MEMORY;
 	}
 


-- 
Samba Shared Repository