s3-samr: remove init_samr_user* functions.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 22183118e26cda8240d5ff4f6b955383afe7c1cc..5221a5ff94079b28f04f1ba956b313e4ad5a38b2 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5629,132 +5629,6 @@ void init_samr_alias_info1(struct samr_AliasInfoAll *r,
                           const char *description);
 void init_samr_alias_info3(struct lsa_String *r,
                           const char *description);
-void init_samr_user_info5(struct samr_UserInfo5 *r,
-                         const char *account_name,
-                         const char *full_name,
-                         uint32_t rid,
-                         uint32_t primary_gid,
-                         const char *home_directory,
-                         const char *home_drive,
-                         const char *logon_script,
-                         const char *profile_path,
-                         const char *description,
-                         const char *workstations,
-                         NTTIME last_logon,
-                         NTTIME last_logoff,
-                         struct samr_LogonHours logon_hours,
-                         uint16_t bad_password_count,
-                         uint16_t logon_count,
-                         NTTIME last_password_change,
-                         NTTIME acct_expiry,
-                         uint32_t acct_flags);
-void init_samr_user_info7(struct samr_UserInfo7 *r,
-                         const char *account_name);
-void init_samr_user_info9(struct samr_UserInfo9 *r,
-                         uint32_t primary_gid);
-void init_samr_user_info16(struct samr_UserInfo16 *r,
-                          uint32_t acct_flags);
-void init_samr_user_info18(struct samr_UserInfo18 *r,
-                          const uint8 lm_pwd[16],
-                          const uint8 nt_pwd[16],
-                          uint8_t password_expired);
-void init_samr_user_info20(struct samr_UserInfo20 *r,
-                          struct lsa_BinaryString *parameters);
-void init_samr_user_info21(struct samr_UserInfo21 *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME last_password_change,
-                          NTTIME acct_expiry,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *home_directory,
-                          const char *home_drive,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *description,
-                          const char *workstations,
-                          const char *comment,
-                          struct lsa_BinaryString *parameters,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          uint32_t acct_flags,
-                          uint32_t fields_present,
-                          struct samr_LogonHours logon_hours,
-                          uint16_t bad_password_count,
-                          uint16_t logon_count,
-                          uint16_t country_code,
-                          uint16_t code_page,
-                          uint8_t nt_password_set,
-                          uint8_t lm_password_set,
-                          uint8_t password_expired);
-void init_samr_user_info23(struct samr_UserInfo23 *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME last_password_change,
-                          NTTIME acct_expiry,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *home_directory,
-                          const char *home_drive,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *description,
-                          const char *workstations,
-                          const char *comment,
-                          struct lsa_BinaryString *parameters,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          uint32_t acct_flags,
-                          uint32_t fields_present,
-                          struct samr_LogonHours logon_hours,
-                          uint16_t bad_password_count,
-                          uint16_t logon_count,
-                          uint16_t country_code,
-                          uint16_t code_page,
-                          uint8_t nt_password_set,
-                          uint8_t lm_password_set,
-                          uint8_t password_expired,
-                          struct samr_CryptPassword *pwd_buf);
-void init_samr_user_info24(struct samr_UserInfo24 *r,
-                          struct samr_CryptPassword *pwd_buf,
-                          uint8_t password_expired);
-void init_samr_user_info25(struct samr_UserInfo25 *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME last_password_change,
-                          NTTIME acct_expiry,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *home_directory,
-                          const char *home_drive,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *description,
-                          const char *workstations,
-                          const char *comment,
-                          struct lsa_BinaryString *parameters,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          uint32_t acct_flags,
-                          uint32_t fields_present,
-                          struct samr_LogonHours logon_hours,
-                          uint16_t bad_password_count,
-                          uint16_t logon_count,
-                          uint16_t country_code,
-                          uint16_t code_page,
-                          uint8_t nt_password_set,
-                          uint8_t lm_password_set,
-                          uint8_t password_expired,
-                          struct samr_CryptPasswordEx *pwd_buf);
-void init_samr_user_info26(struct samr_UserInfo26 *r,
-                          struct samr_CryptPasswordEx *pwd_buf,
-                          uint8_t password_expired);
 void init_samr_CryptPasswordEx(const char *pwd,
                               DATA_BLOB *session_key,
                               struct samr_CryptPasswordEx *pwd_buf);

diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index a6e4ad8a331740a93143805b2d60a2cbc9979751..edf24203a80e768c540ea9ff560d8c6feed06a28 100644 (file)
--- a/source3/rpc_client/init_samr.c
+++ b/source3/rpc_client/init_samr.c
@@ -252,349 +252,6 @@ void init_samr_alias_info3(struct lsa_String *r,
        init_lsa_String(r, description);
 }
 
-/*******************************************************************
- inits a samr_UserInfo5 structure.
-********************************************************************/
-
-void init_samr_user_info5(struct samr_UserInfo5 *r,
-                         const char *account_name,
-                         const char *full_name,
-                         uint32_t rid,
-                         uint32_t primary_gid,
-                         const char *home_directory,
-                         const char *home_drive,
-                         const char *logon_script,
-                         const char *profile_path,
-                         const char *description,
-                         const char *workstations,
-                         NTTIME last_logon,
-                         NTTIME last_logoff,
-                         struct samr_LogonHours logon_hours,
-                         uint16_t bad_password_count,
-                         uint16_t logon_count,
-                         NTTIME last_password_change,
-                         NTTIME acct_expiry,
-                         uint32_t acct_flags)
-{
-       DEBUG(5, ("init_samr_user_info5\n"));
-
-       init_lsa_String(&r->account_name, account_name);
-       init_lsa_String(&r->full_name, full_name);
-       r->rid = rid;
-       r->primary_gid = primary_gid;
-       init_lsa_String(&r->home_directory, home_directory);
-       init_lsa_String(&r->home_drive, home_drive);
-       init_lsa_String(&r->logon_script, logon_script);
-       init_lsa_String(&r->profile_path, profile_path);
-       init_lsa_String(&r->description, description);
-       init_lsa_String(&r->workstations, workstations);
-       r->last_logon = last_logon;
-       r->last_logoff = last_logoff;
-       r->logon_hours = logon_hours;
-       r->bad_password_count = bad_password_count;
-       r->logon_count = logon_count;
-       r->last_password_change = last_password_change;
-       r->acct_expiry = acct_expiry;
-       r->acct_flags = acct_flags;
-}
-
-
-/*******************************************************************
- inits a samr_UserInfo7 structure.
-********************************************************************/
-
-void init_samr_user_info7(struct samr_UserInfo7 *r,
-                         const char *account_name)
-{
-       DEBUG(5, ("init_samr_user_info7\n"));
-
-       init_lsa_String(&r->account_name, account_name);
-}
-
-/*******************************************************************
- inits a samr_UserInfo9 structure.
-********************************************************************/
-
-void init_samr_user_info9(struct samr_UserInfo9 *r,
-                         uint32_t primary_gid)
-{
-       DEBUG(5, ("init_samr_user_info9\n"));
-
-       r->primary_gid = primary_gid;
-}
-
-/*******************************************************************
- inits a SAM_USER_INFO_16 structure.
-********************************************************************/
-
-void init_samr_user_info16(struct samr_UserInfo16 *r,
-                          uint32_t acct_flags)
-{
-       DEBUG(5, ("init_samr_user_info16\n"));
-
-       r->acct_flags = acct_flags;
-}
-
-/*******************************************************************
- inits a samr_UserInfo18 structure.
-********************************************************************/
-
-void init_samr_user_info18(struct samr_UserInfo18 *r,
-                          const uint8 lm_pwd[16],
-                          const uint8 nt_pwd[16],
-                          uint8_t password_expired)
-{
-       DEBUG(5, ("init_samr_user_info18\n"));
-
-       r->lm_pwd_active =
-               memcpy(r->lm_pwd.hash, lm_pwd, sizeof(r->lm_pwd.hash)) ? true : false;
-       r->nt_pwd_active =
-               memcpy(r->nt_pwd.hash, nt_pwd, sizeof(r->nt_pwd.hash)) ? true : false;
-       r->password_expired = password_expired;
-}
-
-/*******************************************************************
- inits a samr_UserInfo20 structure.
-********************************************************************/
-
-void init_samr_user_info20(struct samr_UserInfo20 *r,
-                          struct lsa_BinaryString *parameters)
-{
-       r->parameters = *parameters;
-}
-
-/*************************************************************************
- inits a samr_UserInfo21 structure
- *************************************************************************/
-
-void init_samr_user_info21(struct samr_UserInfo21 *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME last_password_change,
-                          NTTIME acct_expiry,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *home_directory,
-                          const char *home_drive,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *description,
-                          const char *workstations,
-                          const char *comment,
-                          struct lsa_BinaryString *parameters,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          uint32_t acct_flags,
-                          uint32_t fields_present,
-                          struct samr_LogonHours logon_hours,
-                          uint16_t bad_password_count,
-                          uint16_t logon_count,
-                          uint16_t country_code,
-                          uint16_t code_page,
-                          uint8_t lm_password_set,
-                          uint8_t nt_password_set,
-                          uint8_t password_expired)
-{
-       r->last_logon = last_logon;
-       r->last_logoff = last_logoff;
-       r->last_password_change = last_password_change;
-       r->acct_expiry = acct_expiry;
-       r->allow_password_change = allow_password_change;
-       r->force_password_change = force_password_change;
-       init_lsa_String(&r->account_name, account_name);
-       init_lsa_String(&r->full_name, full_name);
-       init_lsa_String(&r->home_directory, home_directory);
-       init_lsa_String(&r->home_drive, home_drive);
-       init_lsa_String(&r->logon_script, logon_script);
-       init_lsa_String(&r->profile_path, profile_path);
-       init_lsa_String(&r->description, description);
-       init_lsa_String(&r->workstations, workstations);
-       init_lsa_String(&r->comment, comment);
-       r->parameters = *parameters;
-       r->rid = rid;
-       r->primary_gid = primary_gid;
-       r->acct_flags = acct_flags;
-       r->fields_present = fields_present;
-       r->logon_hours = logon_hours;
-       r->bad_password_count = bad_password_count;
-       r->logon_count = logon_count;
-       r->country_code = country_code;
-       r->code_page = code_page;
-       r->lm_password_set = lm_password_set;
-       r->nt_password_set = nt_password_set;
-       r->password_expired = password_expired;
-}
-
-/*************************************************************************
- init_samr_user_info23
- *************************************************************************/
-
-void init_samr_user_info23(struct samr_UserInfo23 *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME last_password_change,
-                          NTTIME acct_expiry,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *home_directory,
-                          const char *home_drive,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *description,
-                          const char *workstations,
-                          const char *comment,
-                          struct lsa_BinaryString *parameters,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          uint32_t acct_flags,
-                          uint32_t fields_present,
-                          struct samr_LogonHours logon_hours,
-                          uint16_t bad_password_count,
-                          uint16_t logon_count,
-                          uint16_t country_code,
-                          uint16_t code_page,
-                          uint8_t lm_password_set,
-                          uint8_t nt_password_set,
-                          uint8_t password_expired,
-                          struct samr_CryptPassword *pwd_buf)
-{
-       memset(r, '\0', sizeof(*r));
-       init_samr_user_info21(&r->info,
-                             last_logon,
-                             last_logoff,
-                             last_password_change,
-                             acct_expiry,
-                             allow_password_change,
-                             force_password_change,
-                             account_name,
-                             full_name,
-                             home_directory,
-                             home_drive,
-                             logon_script,
-                             profile_path,
-                             description,
-                             workstations,
-                             comment,
-                             parameters,
-                             rid,
-                             primary_gid,
-                             acct_flags,
-                             fields_present,
-                             logon_hours,
-                             bad_password_count,
-                             logon_count,
-                             country_code,
-                             code_page,
-                             lm_password_set,
-                             nt_password_set,
-                             password_expired);
-
-       r->password = *pwd_buf;
-}
-
-/*************************************************************************
- init_samr_user_info24
- *************************************************************************/
-
-void init_samr_user_info24(struct samr_UserInfo24 *r,
-                          struct samr_CryptPassword *pwd_buf,
-                          uint8_t password_expired)
-{
-       DEBUG(10, ("init_samr_user_info24:\n"));
-
-       r->password = *pwd_buf;
-       r->password_expired = password_expired;
-}
-
-/*************************************************************************
- init_samr_user_info25
- *************************************************************************/
-
-void init_samr_user_info25(struct samr_UserInfo25 *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME last_password_change,
-                          NTTIME acct_expiry,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *home_directory,
-                          const char *home_drive,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *description,
-                          const char *workstations,
-                          const char *comment,
-                          struct lsa_BinaryString *parameters,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          uint32_t acct_flags,
-                          uint32_t fields_present,
-                          struct samr_LogonHours logon_hours,
-                          uint16_t bad_password_count,
-                          uint16_t logon_count,
-                          uint16_t country_code,
-                          uint16_t code_page,
-                          uint8_t lm_password_set,
-                          uint8_t nt_password_set,
-                          uint8_t password_expired,
-                          struct samr_CryptPasswordEx *pwd_buf)
-{
-       DEBUG(10, ("init_samr_user_info25:\n"));
-
-       memset(r, '\0', sizeof(*r));
-       init_samr_user_info21(&r->info,
-                             last_logon,
-                             last_logoff,
-                             last_password_change,
-                             acct_expiry,
-                             allow_password_change,
-                             force_password_change,
-                             account_name,
-                             full_name,
-                             home_directory,
-                             home_drive,
-                             logon_script,
-                             profile_path,
-                             description,
-                             workstations,
-                             comment,
-                             parameters,
-                             rid,
-                             primary_gid,
-                             acct_flags,
-                             fields_present,
-                             logon_hours,
-                             bad_password_count,
-                             logon_count,
-                             country_code,
-                             code_page,
-                             lm_password_set,
-                             nt_password_set,
-                             password_expired);
-
-       r->password = *pwd_buf;
-}
-
-/*************************************************************************
- init_samr_user_info26
- *************************************************************************/
-
-void init_samr_user_info26(struct samr_UserInfo26 *r,
-                          struct samr_CryptPasswordEx *pwd_buf,
-                          uint8_t password_expired)
-{
-       DEBUG(10, ("init_samr_user_info26:\n"));
-
-       r->password = *pwd_buf;
-       r->password_expired = password_expired;
-}
-
 /*************************************************************************
  inits a samr_CryptPasswordEx structure
  *************************************************************************/