sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-12 01:49:28 +03:00
Code Activity

r9163: Rename UNKNOWN_TYPE_10 to PAC_LOGON_NAME (merge from samba4)

Browse Source 
Guenther
(This used to be commit d14dcba963)
This commit is contained in:
Günther Deschner
2005-08-06 04:35:11 +00:00
committed by Gerald (Jerry) Carter
parent 3dae794632
commit cc6843fcca
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/include/authdata.h
View File

@ -27,13 +27,13 @@
#define PAC_TYPE_LOGON_INFO 1
#define PAC_TYPE_SERVER_CHECKSUM 6
#define PAC_TYPE_PRIVSVR_CHECKSUM 7
#define PAC_TYPE_UNKNOWN_10 10
#define PAC_TYPE_LOGON_NAME 10
typedef struct unknown_type_10 {
NTTIME unknown_time;
typedef struct pac_logon_name {
NTTIME logon_time;
uint16 len;
uint16 *username; /* might not be null terminated, so not UNISTR */
} UNKNOWN_TYPE_10;
} PAC_LOGON_NAME;
typedef struct pac_signature_data {
uint32 type;
@ -130,7 +130,7 @@ typedef struct pac_info_ctr
PAC_LOGON_INFO *logon_info;
PAC_SIGNATURE_DATA *srv_cksum;
PAC_SIGNATURE_DATA *privsrv_cksum;
UNKNOWN_TYPE_10 *type_10;
PAC_LOGON_NAME *logon_name;
} pac;
} PAC_INFO_CTR;

32
source3/libads/authdata.c
View File

@ -43,31 +43,31 @@ static DATA_BLOB unwrap_pac(DATA_BLOB *auth_data)
return pac_contents;
}
static BOOL pac_io_unknown_type_10(const char *desc, UNKNOWN_TYPE_10 *type_10,
prs_struct *ps, int depth)
static BOOL pac_io_logon_name(const char *desc, PAC_LOGON_NAME *logon_name,
prs_struct *ps, int depth)
{
if (NULL == type_10)
if (NULL == logon_name)
return False;
prs_debug(ps, depth, desc, "pac_io_unknown_type_10");
prs_debug(ps, depth, desc, "pac_io_logon_name");
depth++;
if (!smb_io_time("unknown_time", &type_10->unknown_time, ps, depth))
if (!smb_io_time("logon_time", &logon_name->logon_time, ps, depth))
return False;
if (!prs_uint16("len", ps, depth, &type_10->len))
if (!prs_uint16("len", ps, depth, &logon_name->len))
return False;
if (UNMARSHALLING(ps) && type_10->len) {
type_10->username = PRS_ALLOC_MEM(ps, uint16, type_10->len);
if (!type_10->username) {
if (UNMARSHALLING(ps) && logon_name->len) {
logon_name->username = PRS_ALLOC_MEM(ps, uint16, logon_name->len);
if (!logon_name->username) {
DEBUG(3, ("No memory available\n"));
return False;
}
}
if (!prs_uint16s(True, "name", ps, depth, type_10->username,
(type_10->len / sizeof(uint16))))
if (!prs_uint16s(True, "name", ps, depth, logon_name->username,
(logon_name->len / sizeof(uint16))))
return False;
return True;
@ -499,15 +499,15 @@ static BOOL pac_io_pac_info_hdr_ctr(const char *desc, PAC_INFO_HDR *hdr,
return False;
break;
case PAC_TYPE_UNKNOWN_10:
DEBUG(5, ("PAC_TYPE_UNKNOWN_10\n"));
case PAC_TYPE_LOGON_NAME:
DEBUG(5, ("PAC_TYPE_LOGON_NAME\n"));
if (UNMARSHALLING(ps))
hdr->ctr->pac.type_10 = PRS_ALLOC_MEM(ps, UNKNOWN_TYPE_10, 1);
if (!hdr->ctr->pac.type_10) {
hdr->ctr->pac.logon_name = PRS_ALLOC_MEM(ps, PAC_LOGON_NAME, 1);
if (!hdr->ctr->pac.logon_name) {
DEBUG(3, ("No memory available\n"));
return False;
}
if (!pac_io_unknown_type_10(desc, hdr->ctr->pac.type_10,
if (!pac_io_logon_name(desc, hdr->ctr->pac.logon_name,
ps, depth))
return False;
break;