s3-netlogon: remove init_netr_SamInfo functions.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 17d754c83267ca91e84d133156cb709c6b2d25e5..c40b4b6e730504c2994f78c5be7f5697c2be0d62 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5553,58 +5553,6 @@ void init_lsa_AsciiStringLarge(struct lsa_AsciiStringLarge *name, const char *s)
 
 /* The following definitions come from rpc_client/init_netlogon.c  */
 
-void init_netr_SamBaseInfo(struct netr_SamBaseInfo *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME acct_expiry,
-                          NTTIME last_password_change,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *home_directory,
-                          const char *home_drive,
-                          uint16_t logon_count,
-                          uint16_t bad_password_count,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          struct samr_RidWithAttributeArray groups,
-                          uint32_t user_flags,
-                          struct netr_UserSessionKey key,
-                          const char *logon_server,
-                          const char *domain,
-                          struct dom_sid2 *domain_sid,
-                          struct netr_LMSessionKey LMSessKey,
-                          uint32_t acct_flags);
-void init_netr_SamInfo3(struct netr_SamInfo3 *r,
-                       NTTIME last_logon,
-                       NTTIME last_logoff,
-                       NTTIME acct_expiry,
-                       NTTIME last_password_change,
-                       NTTIME allow_password_change,
-                       NTTIME force_password_change,
-                       const char *account_name,
-                       const char *full_name,
-                       const char *logon_script,
-                       const char *profile_path,
-                       const char *home_directory,
-                       const char *home_drive,
-                       uint16_t logon_count,
-                       uint16_t bad_password_count,
-                       uint32_t rid,
-                       uint32_t primary_gid,
-                       struct samr_RidWithAttributeArray groups,
-                       uint32_t user_flags,
-                       struct netr_UserSessionKey key,
-                       const char *logon_server,
-                       const char *domain,
-                       struct dom_sid2 *domain_sid,
-                       struct netr_LMSessionKey LMSessKey,
-                       uint32_t acct_flags,
-                       uint32_t sidcount,
-                       struct netr_SidAttr *sids);
 NTSTATUS serverinfo_to_SamInfo2(struct auth_serversupplied_info *server_info,
                                uint8_t *pipe_session_key,
                                size_t pipe_session_key_len,

diff --git a/source3/rpc_client/init_netlogon.c b/source3/rpc_client/init_netlogon.c
index 99803aa597555b11149fffe624a493824bd60f72..88a18dee0704b9a14fee62d338b65573dcc8f257 100644 (file)
--- a/source3/rpc_client/init_netlogon.c
+++ b/source3/rpc_client/init_netlogon.c
@@ -24,123 +24,6 @@
  inits a structure.
 ********************************************************************/
 
-void init_netr_SamBaseInfo(struct netr_SamBaseInfo *r,
-                          NTTIME last_logon,
-                          NTTIME last_logoff,
-                          NTTIME acct_expiry,
-                          NTTIME last_password_change,
-                          NTTIME allow_password_change,
-                          NTTIME force_password_change,
-                          const char *account_name,
-                          const char *full_name,
-                          const char *logon_script,
-                          const char *profile_path,
-                          const char *home_directory,
-                          const char *home_drive,
-                          uint16_t logon_count,
-                          uint16_t bad_password_count,
-                          uint32_t rid,
-                          uint32_t primary_gid,
-                          struct samr_RidWithAttributeArray groups,
-                          uint32_t user_flags,
-                          struct netr_UserSessionKey key,
-                          const char *logon_server,
-                          const char *domain,
-                          struct dom_sid2 *domain_sid,
-                          struct netr_LMSessionKey LMSessKey,
-                          uint32_t acct_flags)
-{
-       r->last_logon = last_logon;
-       r->last_logoff = last_logoff;
-       r->acct_expiry = acct_expiry;
-       r->last_password_change = last_password_change;
-       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->logon_script, logon_script);
-       init_lsa_String(&r->profile_path, profile_path);
-       init_lsa_String(&r->home_directory, home_directory);
-       init_lsa_String(&r->home_drive, home_drive);
-       r->logon_count = logon_count;
-       r->bad_password_count = bad_password_count;
-       r->rid = rid;
-       r->primary_gid = primary_gid;
-       r->groups = groups;
-       r->user_flags = user_flags;
-       r->key = key;
-       init_lsa_StringLarge(&r->logon_server, logon_server);
-       init_lsa_StringLarge(&r->domain, domain);
-       r->domain_sid = domain_sid;
-       r->LMSessKey = LMSessKey;
-       r->acct_flags = acct_flags;
-}
-
-/*******************************************************************
- inits a structure.
-********************************************************************/
-
-void init_netr_SamInfo3(struct netr_SamInfo3 *r,
-                       NTTIME last_logon,
-                       NTTIME last_logoff,
-                       NTTIME acct_expiry,
-                       NTTIME last_password_change,
-                       NTTIME allow_password_change,
-                       NTTIME force_password_change,
-                       const char *account_name,
-                       const char *full_name,
-                       const char *logon_script,
-                       const char *profile_path,
-                       const char *home_directory,
-                       const char *home_drive,
-                       uint16_t logon_count,
-                       uint16_t bad_password_count,
-                       uint32_t rid,
-                       uint32_t primary_gid,
-                       struct samr_RidWithAttributeArray groups,
-                       uint32_t user_flags,
-                       struct netr_UserSessionKey key,
-                       const char *logon_server,
-                       const char *domain,
-                       struct dom_sid2 *domain_sid,
-                       struct netr_LMSessionKey LMSessKey,
-                       uint32_t acct_flags,
-                       uint32_t sidcount,
-                       struct netr_SidAttr *sids)
-{
-       init_netr_SamBaseInfo(&r->base,
-                             last_logon,
-                             last_logoff,
-                             acct_expiry,
-                             last_password_change,
-                             allow_password_change,
-                             force_password_change,
-                             account_name,
-                             full_name,
-                             logon_script,
-                             profile_path,
-                             home_directory,
-                             home_drive,
-                             logon_count,
-                             bad_password_count,
-                             rid,
-                             primary_gid,
-                             groups,
-                             user_flags,
-                             key,
-                             logon_server,
-                             domain,
-                             domain_sid,
-                             LMSessKey,
-                             acct_flags);
-       r->sidcount = sidcount;
-       r->sids = sids;
-}
-
-/*******************************************************************
- inits a structure.
-********************************************************************/
-
 void init_netr_IdentityInfo(struct netr_IdentityInfo *r,
                            const char *domain_name,
                            uint32_t parameter_control,

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index d79c3f549180e7a5430e59896e59a5fa69deb82e..2f3d7632b065aad0a0e99b486ca036d9af495722 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1635,31 +1635,31 @@ static NTSTATUS serverinfo_to_SamInfo_base(TALLOC_CTX *mem_ctx,
        unix_to_nt_time(&allow_password_change, pdb_get_pass_can_change_time(sampw));
        unix_to_nt_time(&force_password_change, pdb_get_pass_must_change_time(sampw));
 
-       init_netr_SamBaseInfo(base,
-                             last_logon,
-                             last_logoff,
-                             acct_expiry,
-                             last_password_change,
-                             allow_password_change,
-                             force_password_change,
-                             talloc_strdup(mem_ctx, pdb_get_username(sampw)),
-                             talloc_strdup(mem_ctx, pdb_get_fullname(sampw)),
-                             talloc_strdup(mem_ctx, pdb_get_logon_script(sampw)),
-                             talloc_strdup(mem_ctx, pdb_get_profile_path(sampw)),
-                             talloc_strdup(mem_ctx, pdb_get_homedir(sampw)),
-                             talloc_strdup(mem_ctx, pdb_get_dir_drive(sampw)),
-                             0, /* logon_count */
-                             0, /* bad_password_count */
-                             user_rid,
-                             group_rid,
-                             groups,
-                             NETLOGON_EXTRA_SIDS,
-                             user_session_key,
-                             my_name,
-                             talloc_strdup(mem_ctx, pdb_get_domain(sampw)),
-                             sid,
-                             lm_session_key,
-                             pdb_get_acct_ctrl(sampw));
+       base->last_logon                = last_logon;
+       base->last_logoff               = last_logoff;
+       base->acct_expiry               = acct_expiry;
+       base->last_password_change      = last_password_change;
+       base->allow_password_change     = allow_password_change;
+       base->force_password_change     = force_password_change;
+       base->account_name.string       = talloc_strdup(mem_ctx, pdb_get_username(sampw));
+       base->full_name.string          = talloc_strdup(mem_ctx, pdb_get_fullname(sampw));
+       base->logon_script.string       = talloc_strdup(mem_ctx, pdb_get_logon_script(sampw));
+       base->profile_path.string       = talloc_strdup(mem_ctx, pdb_get_profile_path(sampw));
+       base->home_directory.string     = talloc_strdup(mem_ctx, pdb_get_homedir(sampw));
+       base->home_drive.string         = talloc_strdup(mem_ctx, pdb_get_dir_drive(sampw));
+       base->logon_count               = 0; /* ?? */
+       base->bad_password_count        = 0; /* ?? */
+       base->rid                       = user_rid;
+       base->primary_gid               = group_rid;
+       base->groups                    = groups;
+       base->user_flags                = NETLOGON_EXTRA_SIDS;
+       base->key                       = user_session_key;
+       base->logon_server.string       = my_name;
+       base->domain.string             = talloc_strdup(mem_ctx, pdb_get_domain(sampw));
+       base->domain_sid                = sid;
+       base->LMSessKey                 = lm_session_key;
+       base->acct_flags                = pdb_get_acct_ctrl(sampw);
+
        ZERO_STRUCT(user_session_key);
        ZERO_STRUCT(lm_session_key);