r3571: 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.
(This used to be commit bffd18d09df04c1e492ef12f744ff4b6c561d53c)

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index dc57d349b4871e438f898e2767567bfe49d3b6b4..741cd5554238a7fdac3994b4fc90a9e0c46d28b2 100644 (file)
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -76,6 +76,7 @@ struct auth_serversupplied_info
 
        const char *account_name;
        const char *domain;
+       const char *realm;
 
        const char *full_name;
        const char *logon_script;

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 2d1679fd1cdfd261af1bf48ee0a19c82d8a0f55f..00dfbf6c79e3e682f468d909cc3532cfdc97920d 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -48,6 +48,7 @@ struct samr_LogonHours;
 
 struct netr_SamInfo3;
 struct netr_Authenticator;
+union netr_Validation;
 
 struct iface_struct;
 

diff --git a/source4/lib/data_blob.c b/source4/lib/data_blob.c
index 7803179d3905afbc2c6c4530db6ff98892e21bd9..d2147be6b275e7893adddf69d14f421fbffbfcd6 100644 (file)
--- a/source4/lib/data_blob.c
+++ b/source4/lib/data_blob.c
@@ -61,6 +61,18 @@ DATA_BLOB data_blob_talloc_named(TALLOC_CTX *mem_ctx, const void *p, size_t leng
        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

diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index 37e96cf9dce64352a6cfbfec2bc043d2db0e3a4b..a95780236ea51fe015a97ccdbc9ea55ee6bedf85 100644 (file)
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -668,7 +668,9 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
                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);