mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
r5879: Rename SAMR_FIELD_WORKSTATION to SAMR_FIELD_WORKSTATIONS - it is a list.
Andrew Bartlett
This commit is contained in:
parent
b7297c44fa
commit
7822101cb5
@ -671,7 +671,7 @@
|
|||||||
SAMR_FIELD_COMMENT = 0x00000020,
|
SAMR_FIELD_COMMENT = 0x00000020,
|
||||||
SAMR_FIELD_LOGON_SCRIPT = 0x00000100,
|
SAMR_FIELD_LOGON_SCRIPT = 0x00000100,
|
||||||
SAMR_FIELD_PROFILE_PATH = 0x00000200,
|
SAMR_FIELD_PROFILE_PATH = 0x00000200,
|
||||||
SAMR_FIELD_WORKSTATION = 0x00000400,
|
SAMR_FIELD_WORKSTATIONS = 0x00000400,
|
||||||
SAMR_FIELD_LOGON_HOURS = 0x00002000,
|
SAMR_FIELD_LOGON_HOURS = 0x00002000,
|
||||||
SAMR_FIELD_ACCT_FLAGS = 0x00100000,
|
SAMR_FIELD_ACCT_FLAGS = 0x00100000,
|
||||||
SAMR_FIELD_PARAMETERS = 0x00200000,
|
SAMR_FIELD_PARAMETERS = 0x00200000,
|
||||||
|
@ -2690,7 +2690,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
|
|||||||
SET_STRING(msg, info21.logon_script.string, "scriptPath");
|
SET_STRING(msg, info21.logon_script.string, "scriptPath");
|
||||||
IFSET(SAMR_FIELD_PROFILE_PATH)
|
IFSET(SAMR_FIELD_PROFILE_PATH)
|
||||||
SET_STRING(msg, info21.profile_path.string, "profilePath");
|
SET_STRING(msg, info21.profile_path.string, "profilePath");
|
||||||
IFSET(SAMR_FIELD_WORKSTATION)
|
IFSET(SAMR_FIELD_WORKSTATIONS)
|
||||||
SET_STRING(msg, info21.workstations.string, "userWorkstations");
|
SET_STRING(msg, info21.workstations.string, "userWorkstations");
|
||||||
IFSET(SAMR_FIELD_LOGON_HOURS)
|
IFSET(SAMR_FIELD_LOGON_HOURS)
|
||||||
SET_LHOURS(msg, info21.logon_hours, "logonHours");
|
SET_LHOURS(msg, info21.logon_hours, "logonHours");
|
||||||
@ -2722,7 +2722,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
|
|||||||
SET_STRING(msg, info23.info.logon_script.string, "scriptPath");
|
SET_STRING(msg, info23.info.logon_script.string, "scriptPath");
|
||||||
IFSET(SAMR_FIELD_PROFILE_PATH)
|
IFSET(SAMR_FIELD_PROFILE_PATH)
|
||||||
SET_STRING(msg, info23.info.profile_path.string, "profilePath");
|
SET_STRING(msg, info23.info.profile_path.string, "profilePath");
|
||||||
IFSET(SAMR_FIELD_WORKSTATION)
|
IFSET(SAMR_FIELD_WORKSTATIONS)
|
||||||
SET_STRING(msg, info23.info.workstations.string, "userWorkstations");
|
SET_STRING(msg, info23.info.workstations.string, "userWorkstations");
|
||||||
IFSET(SAMR_FIELD_LOGON_HOURS)
|
IFSET(SAMR_FIELD_LOGON_HOURS)
|
||||||
SET_LHOURS(msg, info23.info.logon_hours, "logonHours");
|
SET_LHOURS(msg, info23.info.logon_hours, "logonHours");
|
||||||
@ -2776,7 +2776,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
|
|||||||
SET_STRING(msg, info25.info.logon_script.string, "scriptPath");
|
SET_STRING(msg, info25.info.logon_script.string, "scriptPath");
|
||||||
IFSET(SAMR_FIELD_PROFILE_PATH)
|
IFSET(SAMR_FIELD_PROFILE_PATH)
|
||||||
SET_STRING(msg, info25.info.profile_path.string, "profilePath");
|
SET_STRING(msg, info25.info.profile_path.string, "profilePath");
|
||||||
IFSET(SAMR_FIELD_WORKSTATION)
|
IFSET(SAMR_FIELD_WORKSTATIONS)
|
||||||
SET_STRING(msg, info25.info.workstations.string, "userWorkstations");
|
SET_STRING(msg, info25.info.workstations.string, "userWorkstations");
|
||||||
IFSET(SAMR_FIELD_LOGON_HOURS)
|
IFSET(SAMR_FIELD_LOGON_HOURS)
|
||||||
SET_LHOURS(msg, info25.info.logon_hours, "logonHours");
|
SET_LHOURS(msg, info25.info.logon_hours, "logonHours");
|
||||||
|
@ -328,7 +328,7 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
|
|||||||
TEST_USERINFO_STRING(14, workstations, 5, workstations, "14workstation4", 0);
|
TEST_USERINFO_STRING(14, workstations, 5, workstations, "14workstation4", 0);
|
||||||
TEST_USERINFO_STRING(14, workstations, 21, workstations, "14workstation21", 0);
|
TEST_USERINFO_STRING(14, workstations, 21, workstations, "14workstation21", 0);
|
||||||
TEST_USERINFO_STRING(21, workstations, 21, workstations, "21workstation21",
|
TEST_USERINFO_STRING(21, workstations, 21, workstations, "21workstation21",
|
||||||
SAMR_FIELD_WORKSTATION);
|
SAMR_FIELD_WORKSTATIONS);
|
||||||
|
|
||||||
TEST_USERINFO_STRING(20, parameters, 21, parameters, "xx20-21 parameters", 0);
|
TEST_USERINFO_STRING(20, parameters, 21, parameters, "xx20-21 parameters", 0);
|
||||||
TEST_USERINFO_STRING(21, parameters, 21, parameters, "xx21-21 parameters",
|
TEST_USERINFO_STRING(21, parameters, 21, parameters, "xx21-21 parameters",
|
||||||
@ -385,6 +385,7 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
|
|||||||
TEST_USERINFO_INT(9, primary_gid, 5, primary_gid, 513);
|
TEST_USERINFO_INT(9, primary_gid, 5, primary_gid, 513);
|
||||||
TEST_USERINFO_INT(9, primary_gid, 21, primary_gid, 513);
|
TEST_USERINFO_INT(9, primary_gid, 21, primary_gid, 513);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user