summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/ldap.c4
-rw-r--r--source3/passdb/nispass.c2
-rw-r--r--source3/passdb/passdb.c5
-rw-r--r--source3/rpc_parse/parse_prs.c8
4 files changed, 9 insertions, 10 deletions
diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index 54566e454b..b520f521bd 100644
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -356,8 +356,8 @@ static void ldap_get_sam_passwd(LDAP *ldap_struct, LDAPMessage *entry,
user->logon_divs = 168; /* hours per week */
user->hours_len = 21; /* 21 times 8 bits = 168 */
memset(user->hours, 0xff, user->hours_len); /* available at all hours */
- user->unknown_5 = 0x00020000; /* don't know */
- user->unknown_5 = 0x000004ec; /* don't know */
+ user->unknown_5 = 0x00000000; /* don't know */
+ user->unknown_6 = 0x000004ec; /* don't know */
if (user->acct_ctrl & (ACB_DOMTRUST|ACB_WSTRUST|ACB_SVRTRUST) )
{
diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c
index 4b4e281c29..2959f6ca7c 100644
--- a/source3/passdb/nispass.c
+++ b/source3/passdb/nispass.c
@@ -353,7 +353,7 @@ static BOOL make_sam_from_nisp_object(struct sam_passwd *pw_buf, nis_object *obj
pw_buf->logon_divs = 168; /* hours per week */
pw_buf->hours_len = 21; /* 21 times 8 bits = 168 */
memset(pw_buf->hours, 0xff, pw_buf->hours_len); /* available at all hours */
- pw_buf->unknown_5 = 0x00020000; /* don't know */
+ pw_buf->unknown_5 = 0x00000000; /* don't know */
pw_buf->unknown_6 = 0x000004ec; /* don't know */
return True;
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 0e4948a322..428dd004ee 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -116,9 +116,8 @@ void pdb_init_sam(SAM_ACCOUNT *user)
user->logon_divs = 168; /* hours per week */
user->hours_len = 21; /* 21 times 8 bits = 168 */
memset(user->hours, 0xff, user->hours_len); /* available at all hours */
- user->unknown_5 = 0x00020000; /* don't know */
- user->unknown_5 = 0x000004ec; /* don't know */
-
+ user->unknown_5 = 0x00000000; /* don't know */
+ user->unknown_6 = 0x000004ec; /* don't know */
}
/************************************************************
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index 56d03daf18..1ec3f72d4c 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -673,16 +673,16 @@ BOOL prs_unistr2(BOOL charmode, char *name, prs_struct *ps, int depth, UNISTR2 *
if (q == NULL)
return False;
+ /* If the string is empty, we don't have anything to stream */
+ if (str->uni_str_len==0)
+ return True;
+
if (UNMARSHALLING(ps)) {
str->buffer = (uint16 *)prs_alloc_mem(ps,str->uni_max_len * sizeof(uint16));
if (str->buffer == NULL)
return False;
}
- /* If the string is empty, we don't have anything to stream */
- if (str->uni_str_len==0)
- return True;
-
p = (char *)str->buffer;
/* If we're using big-endian, reverse to get little-endian. */