1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-02 00:23:50 +03:00

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

This concludes the proper fixes.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2004-11-06 05:40:34 +00:00
committed by Gerald (Jerry) Carter
parent bffd18d09d
commit c1d025793f
3 changed files with 9 additions and 6 deletions

View File

@@ -63,13 +63,18 @@ DATA_BLOB data_blob_talloc_named(TALLOC_CTX *mem_ctx, const void *p, size_t leng
/******************************************************************* /*******************************************************************
construct a data blob which is a reference to another blob, in reference a data blob, to the supplied TALLOC_CTX.
the given mem context Returns a NULL DATA_BLOB on failure
*******************************************************************/ *******************************************************************/
DATA_BLOB data_blob_talloc_reference(TALLOC_CTX *mem_ctx, DATA_BLOB *blob) DATA_BLOB data_blob_talloc_reference(TALLOC_CTX *mem_ctx, DATA_BLOB *blob)
{ {
DATA_BLOB ret = *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; return ret;
} }

View File

@@ -668,9 +668,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
server_info->logon_count = logon_info->logon_count; server_info->logon_count = logon_info->logon_count;
/* TODO: bad password count */ /* TODO: bad password count */
#if ABARTLET_HAS_FIXED_BUILD
server_info->acct_flags = logon_info->acct_flags; server_info->acct_flags = logon_info->acct_flags;
#endif
if (!server_info->domain || !server_info->account_name || !server_info->realm) { if (!server_info->domain || !server_info->account_name || !server_info->realm) {
free_server_info(&server_info); free_server_info(&server_info);

View File

@@ -75,7 +75,7 @@ interface krb5pac
dom_sid2 *dom_sid; dom_sid2 *dom_sid;
uint32 reserved16[2]; 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 reserved18[7];
uint32 extra_sids_count; uint32 extra_sids_count;