svn commit: samba r3572 - in branches/SAMBA_4_0/source: lib libcli/auth librpc/idl

[abartlet at samba.org]

Author: abartlet
Date: 2004-11-06 05:40:34 +0000 (Sat, 06 Nov 2004)
New Revision: 3572

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3572

Log:
Thanks to tridge for his patience with my build breakage.

This concludes the proper fixes.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/data_blob.c
   branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
   branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl


Changeset:
Modified: branches/SAMBA_4_0/source/lib/data_blob.c
===================================================================
--- branches/SAMBA_4_0/source/lib/data_blob.c	2004-11-06 03:44:16 UTC (rev 3571)
+++ branches/SAMBA_4_0/source/lib/data_blob.c	2004-11-06 05:40:34 UTC (rev 3572)
@@ -63,13 +63,18 @@
 
 
 /*******************************************************************
- construct a data blob which is a reference to another blob, in 
-the given mem context
+ reference a data blob, to the supplied TALLOC_CTX.  
+ Returns a NULL DATA_BLOB on failure
 *******************************************************************/
 DATA_BLOB data_blob_talloc_reference(TALLOC_CTX *mem_ctx, DATA_BLOB *blob)
 {
 	DATA_BLOB ret = *blob;
-	ret.data = talloc_reference(mem_ctx, ret.data);
+
+	ret.data = talloc_reference(mem_ctx, blob->data);
+
+	if (!ret.data) {
+		return data_blob(NULL, 0);
+	}
 	return ret;
 }
 

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-11-06 03:44:16 UTC (rev 3571)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-11-06 05:40:34 UTC (rev 3572)
@@ -668,9 +668,7 @@
 		server_info->logon_count = logon_info->logon_count;
 		/* TODO: bad password count */
 
-#if ABARTLET_HAS_FIXED_BUILD
 		server_info->acct_flags = logon_info->acct_flags;
-#endif
 
 		if (!server_info->domain || !server_info->account_name || !server_info->realm) {
 			free_server_info(&server_info);

Modified: branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl	2004-11-06 03:44:16 UTC (rev 3571)
+++ branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl	2004-11-06 05:40:34 UTC (rev 3572)
@@ -75,7 +75,7 @@
 		dom_sid2 *dom_sid;
 
 		uint32 reserved16[2];
-		uint32 reserved17;      /* looks like it may be acb_info */
+		uint32 acct_flags;      /* looks like it may be acb_info */
 		uint32 reserved18[7];
 
 		uint32 extra_sids_count;