[SCM] Samba Shared Repository - branch master updated -
f93b0fcd95a02b72591dcc956daa6bd94b2e7f41
Günther Deschner
gd at samba.org
Tue Jan 6 15:02:26 GMT 2009
The branch, master has been updated
via f93b0fcd95a02b72591dcc956daa6bd94b2e7f41 (commit)
via e2fa47a04c912856d5bd0f4f76428d5134e24056 (commit)
via b0f71378839f9276b3d7de2515c712a6c6618fda (commit)
via a94157c759e487b128946ddfa7073832287f6fce (commit)
via be8c5323526b7e2a5306324d74120ebaec601baf (commit)
via 20ba0a947a284d491871ef91a81b602cb97a96dd (commit)
via 0b26f84542dd61bb4af4843d46421fe16ecc70e9 (commit)
via 05784d0fa865d630bf85f84f3797a53ed1e1a6db (commit)
via 15ec09029937774395ad97d5c7fa44a84b3008b2 (commit)
via d2d8d7a087ecbd7da060d877714e4b671a53f5d5 (commit)
via 52b250fe839965e1031549d3a9265115cdaef663 (commit)
via 46f55ef5bc73f9a9d563913433d7d71655123aaa (commit)
from a97c9bab4423d73c8b97bd6589bd1a7ff226cfc7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f93b0fcd95a02b72591dcc956daa6bd94b2e7f41
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 8 18:03:11 2008 +0100
s3-lsa: remove all init_lsa* functions.
Guenther
commit e2fa47a04c912856d5bd0f4f76428d5134e24056
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 8 18:03:01 2008 +0100
s3-lsa: avoid all init_lsa* functions.
Guenther
commit b0f71378839f9276b3d7de2515c712a6c6618fda
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 8 13:39:53 2008 +0100
s3-srvsvc: remove all init_srvsvc* functions.
Guenther
commit a94157c759e487b128946ddfa7073832287f6fce
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 8 13:39:32 2008 +0100
s3-srvsvc: avoid all init_srvsvc* functions.
Guenther
commit be8c5323526b7e2a5306324d74120ebaec601baf
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 01:44:54 2008 +0100
s3-samr: remove all init_samr_alias* functions.
Guenther
commit 20ba0a947a284d491871ef91a81b602cb97a96dd
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 01:44:46 2008 +0100
s3-samr: avoid all init_samr_alias* functions.
Guenther
commit 0b26f84542dd61bb4af4843d46421fe16ecc70e9
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 01:41:38 2008 +0100
s3-samr: remove all init_samr_group* functions.
Guenther
commit 05784d0fa865d630bf85f84f3797a53ed1e1a6db
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 01:41:28 2008 +0100
s3-samr: avoid all init_samr_group* functions.
Guenther
commit 15ec09029937774395ad97d5c7fa44a84b3008b2
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 01:34:51 2008 +0100
s3-samr: remove all init_samr_dom* functions.
Guenther
commit d2d8d7a087ecbd7da060d877714e4b671a53f5d5
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 01:33:28 2008 +0100
s3-samr: avoid all init_samr_Domain* functions.
Guenther
commit 52b250fe839965e1031549d3a9265115cdaef663
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 00:30:11 2008 +0100
s3-samr: remove init_samr_user* functions.
Guenther
commit 46f55ef5bc73f9a9d563913433d7d71655123aaa
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 6 00:28:34 2008 +0100
s3-samr: avoid all init_samr_user* functions.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 3 +-
source3/include/proto.h | 332 ---------------------
source3/lib/netapi/user.c | 64 +++--
source3/libnet/libnet_join.c | 8 +-
source3/rpc_client/cli_lsarpc.c | 52 ++--
source3/rpc_client/init_lsa.c | 70 -----
source3/rpc_client/init_samr.c | 576 ------------------------------------
source3/rpc_client/init_srvsvc.c | 402 -------------------------
source3/rpc_server/srv_lsa_nt.c | 10 +-
source3/rpc_server/srv_samr_nt.c | 349 ++++++++--------------
source3/rpc_server/srv_srvsvc_nt.c | 205 +++++++-------
source3/rpcclient/cmd_samr.c | 22 +-
source3/utils/net_rpc.c | 30 +--
source3/utils/net_rpc_join.c | 4 +-
source3/winbindd/winbindd_passdb.c | 30 +--
15 files changed, 323 insertions(+), 1834 deletions(-)
delete mode 100644 source3/rpc_client/init_srvsvc.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 89143fa..1625e65 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -313,8 +313,7 @@ RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o
RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o \
rpc_client/init_netlogon.o \
- rpc_client/init_lsa.o \
- rpc_client/init_srvsvc.o
+ rpc_client/init_lsa.o
LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2218311..826900c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5460,27 +5460,6 @@ void init_lsa_String(struct lsa_String *name, const char *s);
void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s);
void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s);
void init_lsa_AsciiStringLarge(struct lsa_AsciiStringLarge *name, const char *s);
-void init_lsa_sec_qos(struct lsa_QosInfo *r,
- uint32_t len,
- uint16_t impersonation_level,
- uint8_t context_mode,
- uint8_t effective_only);
-void init_lsa_obj_attr(struct lsa_ObjectAttribute *r,
- uint32_t len,
- uint8_t *root_dir,
- const char *object_name,
- uint32_t attributes,
- struct security_descriptor *sec_desc,
- struct lsa_QosInfo *sec_qos);
-void init_lsa_translated_sid(struct lsa_TranslatedSid *r,
- enum lsa_SidType sid_type,
- uint32_t rid,
- uint32_t sid_index);
-void init_lsa_translated_name2(struct lsa_TranslatedName2 *r,
- enum lsa_SidType sid_type,
- const char *name,
- uint32_t sid_index,
- uint32_t unknown);
/* The following definitions come from rpc_client/init_netlogon.c */
@@ -5572,189 +5551,6 @@ void init_netr_CryptPassword(const char *pwd,
/* The following definitions come from rpc_client/init_samr.c */
-void init_samr_DomInfo1(struct samr_DomInfo1 *r,
- uint16_t min_password_length,
- uint16_t password_history_length,
- uint32_t password_properties,
- int64_t max_password_age,
- int64_t min_password_age);
-void init_samr_DomGeneralInformation(struct samr_DomGeneralInformation *r,
- NTTIME force_logoff_time,
- const char *oem_information,
- const char *domain_name,
- const char *primary,
- uint64_t sequence_num,
- enum samr_DomainServerState domain_server_state,
- enum samr_Role role,
- uint32_t unknown3,
- uint32_t num_users,
- uint32_t num_groups,
- uint32_t num_aliases);
-void init_samr_DomInfo3(struct samr_DomInfo3 *r,
- NTTIME force_logoff_time);
-void init_samr_DomOEMInformation(struct samr_DomOEMInformation *r,
- const char *oem_information);
-void init_samr_DomInfo5(struct samr_DomInfo5 *r,
- const char *domain_name);
-void init_samr_DomInfo6(struct samr_DomInfo6 *r,
- const char *primary);
-void init_samr_DomInfo7(struct samr_DomInfo7 *r,
- enum samr_Role role);
-void init_samr_DomInfo8(struct samr_DomInfo8 *r,
- uint64_t sequence_num,
- NTTIME domain_create_time);
-void init_samr_DomInfo9(struct samr_DomInfo9 *r,
- enum samr_DomainServerState domain_server_state);
-void init_samr_DomInfo12(struct samr_DomInfo12 *r,
- uint64_t lockout_duration,
- uint64_t lockout_window,
- uint16_t lockout_threshold);
-void init_samr_group_info1(struct samr_GroupInfoAll *r,
- const char *name,
- uint32_t attributes,
- uint32_t num_members,
- const char *description);
-void init_samr_group_info2(struct lsa_String *r, const char *group_name);
-void init_samr_group_info3(struct samr_GroupInfoAttributes *r,
- uint32_t attributes);
-void init_samr_group_info4(struct lsa_String *r, const char *description);
-void init_samr_group_info5(struct samr_GroupInfoAll *r,
- const char *name,
- uint32_t attributes,
- uint32_t num_members,
- const char *description);
-void init_samr_alias_info1(struct samr_AliasInfoAll *r,
- const char *name,
- uint32_t num_members,
- 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);
@@ -5762,134 +5558,6 @@ void init_samr_CryptPassword(const char *pwd,
DATA_BLOB *session_key,
struct samr_CryptPassword *pwd_buf);
-/* The following definitions come from rpc_client/init_srvsvc.c */
-
-void init_srvsvc_NetSrvInfo102(struct srvsvc_NetSrvInfo102 *r,
- enum srvsvc_PlatformId platform_id,
- const char *server_name,
- uint32_t version_major,
- uint32_t version_minor,
- uint32_t server_type,
- const char *comment,
- uint32_t users,
- uint32_t disc,
- uint32_t hidden,
- uint32_t announce,
- uint32_t anndelta,
- uint32_t licenses,
- const char *userpath);
-void init_srvsvc_NetSrvInfo101(struct srvsvc_NetSrvInfo101 *r,
- enum srvsvc_PlatformId platform_id,
- const char *server_name,
- uint32_t version_major,
- uint32_t version_minor,
- uint32_t server_type,
- const char *comment);
-void init_srvsvc_NetSrvInfo100(struct srvsvc_NetSrvInfo100 *r,
- enum srvsvc_PlatformId platform_id,
- const char *server_name);
-void init_srvsvc_NetShareInfo0(struct srvsvc_NetShareInfo0 *r,
- const char *name);
-void init_srvsvc_NetShareInfo1(struct srvsvc_NetShareInfo1 *r,
- const char *name,
- enum srvsvc_ShareType type,
- const char *comment);
-void init_srvsvc_NetShareInfo2(struct srvsvc_NetShareInfo2 *r,
- const char *name,
- enum srvsvc_ShareType type,
- const char *comment,
- uint32_t permissions,
- uint32_t max_users,
- uint32_t current_users,
- const char *path,
- const char *password);
-void init_srvsvc_NetShareInfo501(struct srvsvc_NetShareInfo501 *r,
- const char *name,
- enum srvsvc_ShareType type,
- const char *comment,
- uint32_t csc_policy);
-void init_srvsvc_NetShareInfo502(struct srvsvc_NetShareInfo502 *r,
- const char *name,
- enum srvsvc_ShareType type,
- const char *comment,
- uint32_t permissions,
- uint32_t max_users,
- uint32_t current_users,
- const char *path,
- const char *password,
- struct sec_desc_buf *sd_buf);
-void init_srvsvc_NetShareInfo1004(struct srvsvc_NetShareInfo1004 *r,
- const char *comment);
-void init_srvsvc_NetShareInfo1005(struct srvsvc_NetShareInfo1005 *r,
- uint32_t dfs_flags);
-void init_srvsvc_NetShareInfo1006(struct srvsvc_NetShareInfo1006 *r,
- uint32_t max_users);
-void init_srvsvc_NetShareInfo1007(struct srvsvc_NetShareInfo1007 *r,
- uint32_t flags,
- const char *alternate_directory_name);
-void init_srvsvc_NetRemoteTODInfo(struct srvsvc_NetRemoteTODInfo *r,
- uint32_t elapsed,
- uint32_t msecs,
- uint32_t hours,
- uint32_t mins,
- uint32_t secs,
- uint32_t hunds,
- int32_t ttimezone,
- uint32_t tinterval,
- uint32_t day,
- uint32_t month,
- uint32_t year,
- uint32_t weekday);
-void init_srvsvc_NetSessInfo0(struct srvsvc_NetSessInfo0 *r,
- const char *client);
-void init_srvsvc_NetSessInfo1(struct srvsvc_NetSessInfo1 *r,
- const char *client,
- const char *user,
- uint32_t num_open,
- uint32_t _time,
- uint32_t idle_time,
- uint32_t user_flags);
-void init_srvsvc_NetSessInfo2(struct srvsvc_NetSessInfo2 *r,
- const char *client,
- const char *user,
- uint32_t num_open,
- uint32_t _time,
- uint32_t idle_time,
- uint32_t user_flags,
- const char *client_type);
-void init_srvsvc_NetSessInfo10(struct srvsvc_NetSessInfo10 *r,
- const char *client,
- const char *user,
- uint32_t _time,
- uint32_t idle_time);
-void init_srvsvc_NetSessInfo502(struct srvsvc_NetSessInfo502 *r,
- const char *client,
- const char *user,
- uint32_t num_open,
- uint32_t _time,
- uint32_t idle_time,
- uint32_t user_flags,
- const char *client_type,
- const char *transport);
-void init_srvsvc_NetFileInfo2(struct srvsvc_NetFileInfo2 *r,
- uint32_t fid);
-void init_srvsvc_NetFileInfo3(struct srvsvc_NetFileInfo3 *r,
- uint32_t fid,
- uint32_t permissions,
- uint32_t num_locks,
- const char *path,
- const char *user);
-void init_srvsvc_NetConnInfo0(struct srvsvc_NetConnInfo0 *r,
- uint32_t conn_id);
-void init_srvsvc_NetConnInfo1(struct srvsvc_NetConnInfo1 *r,
- uint32_t conn_id,
- uint32_t conn_type,
- uint32_t num_open,
- uint32_t num_users,
- uint32_t conn_time,
- const char *user,
- const char *share);
-
/* The following definitions come from rpc_client/ndr.c */
NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 1f4b03f..770ffe3 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -91,35 +91,41 @@ static void convert_USER_INFO_X_to_samr_user_info21(struct USER_INFO_X *infoX,
unix_to_nt_time_abs(&password_age, infoX->usriX_password_age);
/* TODO: infoX->usriX_priv */
- init_samr_user_info21(info21,
- 0,
- 0,
- 0,
- 0,
- 0,
- password_age,
- infoX->usriX_name,
- infoX->usriX_full_name,
- infoX->usriX_home_dir,
- infoX->usriX_home_dir_drive,
- infoX->usriX_script_path,
- infoX->usriX_profile,
- infoX->usriX_comment,
- infoX->usriX_workstations,
- infoX->usriX_usr_comment,
- &zero_parameters,
- infoX->usriX_user_id,
- infoX->usriX_primary_group_id,
- infoX->usriX_flags,
- fields_present,
- zero_logon_hours,
- infoX->usriX_bad_pw_count,
- infoX->usriX_num_logons,
- infoX->usriX_country_code,
- infoX->usriX_code_page,
- 0,
- 0,
- infoX->usriX_password_expired);
+
+ info21->last_logon = 0;
+ info21->last_logoff = 0;
+ info21->last_password_change = 0;
+ info21->acct_expiry = 0;
+ info21->allow_password_change = 0;
+ info21->force_password_change = 0;
+ info21->account_name.string = infoX->usriX_name;
+ info21->full_name.string = infoX->usriX_full_name;
+ info21->home_directory.string = infoX->usriX_home_dir;
+ info21->home_drive.string = infoX->usriX_home_dir_drive;
+ info21->logon_script.string = infoX->usriX_script_path;
+ info21->profile_path.string = infoX->usriX_profile;
+ info21->description.string = infoX->usriX_comment;
+ info21->workstations.string = infoX->usriX_workstations;
+ info21->comment.string = infoX->usriX_usr_comment;
+ info21->parameters = zero_parameters;
+ info21->lm_owf_password = zero_parameters;
+ info21->nt_owf_password = zero_parameters;
+ info21->unknown3.string = NULL;
+ info21->buf_count = 0;
+ info21->buffer = NULL;
+ info21->rid = infoX->usriX_user_id;
+ info21->primary_gid = infoX->usriX_primary_group_id;
+ info21->acct_flags = infoX->usriX_flags;
+ info21->fields_present = fields_present;
+ info21->logon_hours = zero_logon_hours;
+ info21->bad_password_count = infoX->usriX_bad_pw_count;
+ info21->logon_count = infoX->usriX_num_logons;
+ info21->country_code = infoX->usriX_country_code;
+ info21->code_page = infoX->usriX_code_page;
+ info21->lm_password_set = 0;
+ info21->nt_password_set = 0;
+ info21->password_expired = infoX->usriX_password_expired;
+ info21->unknown4 = 0;
}
/****************************************************************
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 51d9790..18743aa 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -933,8 +933,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
&cli->user_session_key,
&crypt_pwd_ex);
- init_samr_user_info26(&user_info.info26, &crypt_pwd_ex,
- PASS_DONT_CHANGE_AT_NEXT_LOGON);
+ user_info.info26.password = crypt_pwd_ex;
+ user_info.info26.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;
status = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
&user_pol,
@@ -949,8 +949,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
&cli->user_session_key,
&crypt_pwd);
- init_samr_user_info24(&user_info.info24, &crypt_pwd,
- PASS_DONT_CHANGE_AT_NEXT_LOGON);
+ user_info.info24.password = crypt_pwd;
+ user_info.info24.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;
status = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
&user_pol,
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 577df64..33de986 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -50,23 +50,17 @@ NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
struct lsa_QosInfo qos;
uint16_t system_name = '\\';
+ ZERO_STRUCT(attr);
+
+ attr.len = 0x18;
+
if (sec_qos) {
- init_lsa_sec_qos(&qos, 0xc, 2, 1, 0);
- init_lsa_obj_attr(&attr,
- 0x18,
- NULL,
- NULL,
- 0,
- NULL,
- &qos);
- } else {
- init_lsa_obj_attr(&attr,
- 0x18,
- NULL,
- NULL,
- 0,
- NULL,
--
Samba Shared Repository
More information about the samba-cvs
mailing list