From 04152f475f8589729b703999856ea52c36f9dc6d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 5 Feb 2008 20:18:09 +0100 Subject: Remove last SAM_UNK struct defines. Guenther (This used to be commit 2f877d730be786cd6e3840ea3ef5746d1fc745da) --- source3/include/rpc_samr.h | 18 --------------- source3/rpc_parse/parse_samr.c | 50 ------------------------------------------ 2 files changed, 68 deletions(-) (limited to 'source3') diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index a1bbcb1386..1942dd4352 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -445,24 +445,6 @@ typedef struct sam_user_info_9 } SAM_USER_INFO_9; -typedef struct sam_unknown_info_1_inf -{ - uint16 min_length_password; - uint16 password_history; - uint32 password_properties; - NTTIME expire; - NTTIME min_passwordage; - -} SAM_UNK_INFO_1; - -typedef struct sam_unknown_info_3_info -{ - NTTIME logout; - /* 0x8000 0000 */ /* DON'T forcibly disconnect remote users from server when logon hours expire*/ - /* 0x0000 0000 */ /* forcibly disconnect remote users from server when logon hours expire*/ - -} SAM_UNK_INFO_3; - #define MAX_SAM_ENTRIES_W2K 0x400 #define MAX_SAM_ENTRIES_W95 50 /* The following should be the greater of the preceeding two. */ diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 5de69feadb..5971924478 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -171,56 +171,6 @@ void init_samr_DomInfo12(struct samr_DomInfo12 *r, r->lockout_threshold = lockout_threshold; } -/******************************************************************* -inits a structure. -********************************************************************/ - -void init_unk_info1(SAM_UNK_INFO_1 *u_1, uint16 min_pass_len, uint16 pass_hist, - uint32 password_properties, NTTIME nt_expire, NTTIME nt_min_age) -{ - u_1->min_length_password = min_pass_len; - u_1->password_history = pass_hist; - - if (lp_check_password_script() && *lp_check_password_script()) { - password_properties |= DOMAIN_PASSWORD_COMPLEX; - } - u_1->password_properties = password_properties; - - /* password never expire */ - u_1->expire = nt_expire; - - /* can change the password now */ - u_1->min_passwordage = nt_min_age; - -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -static bool sam_io_unk_info1(const char *desc, SAM_UNK_INFO_1 * u_1, - prs_struct *ps, int depth) -{ - if (u_1 == NULL) - return False; - - prs_debug(ps, depth, desc, "sam_io_unk_info1"); - depth++; - - if(!prs_uint16("min_length_password", ps, depth, &u_1->min_length_password)) - return False; - if(!prs_uint16("password_history", ps, depth, &u_1->password_history)) - return False; - if(!prs_uint32("password_properties", ps, depth, &u_1->password_properties)) - return False; - if(!smb_io_time("expire", &u_1->expire, ps, depth)) - return False; - if(!smb_io_time("min_passwordage", &u_1->min_passwordage, ps, depth)) - return False; - - return True; -} - /******************************************************************* reads or writes a SAM_STR1 structure. ********************************************************************/ -- cgit