summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-06 03:44:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:32 -0500
commite1f38d81383c4adcb28b8e6e4bc0b3c7600277d4 (patch)
tree4974570769359f466a4ba2aae3e685e33980fb3d /source4
parentac29f519363d994052e4f6ec44c7bae40cd0d9a9 (diff)
downloadsamba-e1f38d81383c4adcb28b8e6e4bc0b3c7600277d4.tar.gz
samba-e1f38d81383c4adcb28b8e6e4bc0b3c7600277d4.tar.bz2
samba-e1f38d81383c4adcb28b8e6e4bc0b3c7600277d4.zip
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)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/auth.h1
-rw-r--r--source4/include/structs.h1
-rw-r--r--source4/lib/data_blob.c12
-rw-r--r--source4/libcli/auth/gensec_krb5.c2
4 files changed, 16 insertions, 0 deletions
diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index dc57d349b4..741cd55542 100644
--- 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 2d1679fd1c..00dfbf6c79 100644
--- 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 7803179d39..d2147be6b2 100644
--- 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 37e96cf9dc..a95780236e 100644
--- 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);