svn commit: samba r3571 - in branches/SAMBA_4_0/source: auth include lib libcli/auth

[tridge at samba.org]

Author: tridge
Date: 2004-11-06 03:44:16 +0000 (Sat, 06 Nov 2004)
New Revision: 3571

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

Log:
rough guesses at what abartlet really wanted to do in his last commit
(which I suspect was missing some pieces)

this at least fixes the build so i can keep going on pvfs. Please review/fix Andrew.


Modified:
   branches/SAMBA_4_0/source/auth/auth.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/lib/data_blob.c
   branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth.h
===================================================================
--- branches/SAMBA_4_0/source/auth/auth.h	2004-11-06 01:20:28 UTC (rev 3570)
+++ branches/SAMBA_4_0/source/auth/auth.h	2004-11-06 03:44:16 UTC (rev 3571)
@@ -76,6 +76,7 @@
 
 	const char *account_name;
 	const char *domain;
+	const char *realm;
 
 	const char *full_name;
 	const char *logon_script;

Modified: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h	2004-11-06 01:20:28 UTC (rev 3570)
+++ branches/SAMBA_4_0/source/include/structs.h	2004-11-06 03:44:16 UTC (rev 3571)
@@ -48,6 +48,7 @@
 
 struct netr_SamInfo3;
 struct netr_Authenticator;
+union netr_Validation;
 
 struct iface_struct;
 

Modified: branches/SAMBA_4_0/source/lib/data_blob.c
===================================================================
--- branches/SAMBA_4_0/source/lib/data_blob.c	2004-11-06 01:20:28 UTC (rev 3570)
+++ branches/SAMBA_4_0/source/lib/data_blob.c	2004-11-06 03:44:16 UTC (rev 3571)
@@ -61,7 +61,19 @@
 	return ret;
 }
 
+
 /*******************************************************************
+ construct a data blob which is a reference to another blob, in 
+the given mem context
+*******************************************************************/
+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);
+	return ret;
+}
+
+/*******************************************************************
  construct a zero data blob, using supplied TALLOC_CTX. 
  use this sparingly as it initialises data - better to initialise
  yourself if you want specific data in the blob

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-11-06 01:20:28 UTC (rev 3570)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-11-06 03:44:16 UTC (rev 3571)
@@ -668,7 +668,9 @@
 		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);