r1025: Rename (across the samr and netlogon pipes, so far)

pwd -> password
passwd -> password

username -> account_name

Also work on consistant structure feild names between these two pipes,
and fix up some callers to use samr_Password for the netlogon
credential code.

Andrew Bartlett
(This used to be commit 4e35418c2776f7b79be5b358ffd077754685d1ac)

3 files changed, 54 insertions, 54 deletions

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 64d9afeac3..35a10d8602 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -40,7 +40,7 @@ interface netlogon
 
 	WERROR netr_LogonUasLogon(
 		[in]   unistr *server_name,
-		[in]   unistr username,
+		[in]   unistr account_name,
 		[in]   unistr workstation,
 		[out]  netr_UasInfo *info
 		);
@@ -56,7 +56,7 @@ interface netlogon
 
 	WERROR netr_LogonUasLogoff(
 		[in] unistr *server_name,
-		[in] unistr username,
+		[in] unistr account_name,
 		[in] unistr workstation,
 		[out] netr_UasLogoffInfo info
 		);
@@ -97,7 +97,7 @@ interface netlogon
 		uint32      parameter_control;
 		uint32      logon_id_low;
 		uint32      logon_id_high;
-		netr_String username;
+		netr_String account_name;
 		netr_String workstation;
 	} netr_IdentityInfo;
 
@@ -149,19 +149,19 @@ interface netlogon
 		NTTIME logon_time;
 		NTTIME logoff_time;
 		NTTIME kickoff_time;
-		NTTIME passwd_last_set;
-		NTTIME passwd_can_change;
-		NTTIME passwd_must_change;
+		NTTIME password_last_set;
+		NTTIME password_can_change;
+		NTTIME password_must_change;
 		netr_String account_name;
 		netr_String full_name;
 		netr_String logon_script;
 		netr_String profile_path;
-		netr_String home_dir;
+		netr_String home_directory;
 		netr_String home_drive;
 		uint16 logon_count;
-		uint16 bad_passwd_count;
-		uint32 userid;
-		uint32 primary_group;
+		uint16 bad_password_count;
+		uint32 rid;
+		uint32 primary_gid;
 		uint32 group_count;
 		[size_is(group_count)] netr_GroupMembership *groupids;
 		uint32 user_flags;
@@ -183,19 +183,19 @@ interface netlogon
 		NTTIME logon_time;
 		NTTIME logoff_time;
 		NTTIME kickoff_time;
-		NTTIME passwd_last_set;
-		NTTIME passwd_can_change;
-		NTTIME passwd_must_change;
+		NTTIME password_last_set;
+		NTTIME password_can_change;
+		NTTIME password_must_change;
 		netr_String account_name;
 		netr_String full_name;
 		netr_String logon_script;
 		netr_String profile_path;
-		netr_String home_dir;
+		netr_String home_directory;
 		netr_String home_drive;
 		uint16 logon_count;
-		uint16 bad_passwd_count;
-		uint32 userid;
-		uint32 primary_group;
+		uint16 bad_password_count;
+		uint32 rid;
+		uint32 primary_gid;
 		uint32 group_count;
 		[size_is(group_count)] netr_GroupMembership *groupids;
 		uint32 user_flags;
@@ -280,7 +280,7 @@ interface netlogon
 
 	NTSTATUS netr_ServerAuthenticate(
 		[in]         unistr *server_name,
-		[in]         unistr username,
+		[in]         unistr account_name,
 		[in]         uint16 secure_channel_type,
 		[in]         unistr computer_name,
 		[in,out,ref] netr_Credential *credentials
@@ -292,7 +292,7 @@ interface netlogon
 
 	NTSTATUS netr_ServerPasswordSet(
 		[in]  unistr *server_name,
-		[in]  unistr username,
+		[in]  unistr account_name,
 		[in]  uint16 secure_channel_type,
 		[in]  unistr computer_name,
 		[in]  netr_Authenticator credential,
@@ -305,7 +305,7 @@ interface netlogon
 	/* Function 0x07 */
 
 	typedef struct {
-		unistr *username;
+		unistr *account_name;
 		netr_String unknown1;
 		netr_String unknown2;
 		netr_String unknown3;
@@ -366,10 +366,10 @@ interface netlogon
 		netr_String DomainName;
 		netr_String OEMInfo;
 		NTTIME forcedlogoff;
-		uint16 minpasswdlen;
-		uint16 passwdhistorylen;
-		uint64 pwd_must_change_time;
-		uint64 pwd_can_change_time;
+		uint16 min_password_len;
+		uint16 password_history_len;
+		uint64 password_must_change_time;
+		uint64 password_can_change_time;
 		uint64 sequence_num;
 		NTTIME domain_create_time;
 		uint32 SecurityInformation;
@@ -801,7 +801,7 @@ interface netlogon
 
 	NTSTATUS netr_ServerAuthenticate2(
 		[in]         unistr *server_name,
-		[in]         unistr username,
+		[in]         unistr account_name,
 		[in]         uint16 secure_channel_type,
 		[in]         unistr computer_name,
 		[in,out,ref] netr_Credential *credentials,
@@ -884,7 +884,7 @@ interface netlogon
 	/* Function 0x1a */
 	NTSTATUS netr_ServerAuthenticate3(
 		[in]         unistr *server_name,
-		[in]         unistr username,
+		[in]         unistr account_name,
 		[in]         uint16 secure_channel_type,
 		[in]         unistr computer_name,
 		[in,out,ref] netr_Credential *credentials,
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 8d0a6c0584..886c51b51f 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -135,7 +135,7 @@
 	} samr_Role;
 
 	typedef struct {
-		uint16 min_pwd_len;
+		uint16 min_password_len;
 		uint16 password_history;
 		uint32 password_properties;
 		/* yes, these are signed. They are in negative 100ns */
@@ -278,7 +278,7 @@
 	/* Function    0x0c     */
 	NTSTATUS samr_CreateUser(
 		[in,ref]      policy_handle *handle,
-		[in,ref]      samr_Name *username,
+		[in,ref]      samr_Name *account_name,
 		[in]          uint32 access_mask,
 		[out,ref]     policy_handle *acct_handle,
 		[out,ref]     uint32 *rid
@@ -577,7 +577,7 @@
 	/************************/
 	/* Function    0x24     */
 	typedef struct {
-		samr_Name username;
+		samr_Name account_name;
 		samr_Name full_name;
 		uint32 primary_gid;
 		samr_Name description;
@@ -592,22 +592,22 @@
 	} samr_UserInfo2;
 
 	typedef struct {
-		samr_Name username;
+		samr_Name account_name;
 		samr_Name full_name;
 		uint32 rid;
 		uint32 primary_gid;
 		samr_Name home_directory;
 		samr_Name home_drive;
 		samr_Name logon_script;
-		samr_Name profile;
+		samr_Name profile_path;
 		samr_Name workstations;
 		NTTIME last_logon;
 		NTTIME last_logoff;
-		NTTIME last_pwd_change;
-		NTTIME allow_pwd_change;
-		NTTIME force_pwd_change;
+		NTTIME last_password_change;
+		NTTIME allow_password_change;
+		NTTIME force_password_change;
 		samr_LogonHours logon_hours;
-		uint16 bad_pwd_count;
+		uint16 bad_password_count;
 		uint16 num_logons;
 		uint32 acct_flags;
 	} samr_UserInfo3;
@@ -617,33 +617,33 @@
 	} samr_UserInfo4;
 
 	typedef struct {
-		samr_Name username;
+		samr_Name account_name;
 		samr_Name full_name;
 		uint32 rid;
 		uint32 primary_gid;
 		samr_Name home_directory;
 		samr_Name home_drive;
 		samr_Name logon_script;
-		samr_Name profile;
+		samr_Name profile_path;
 		samr_Name description;
 		samr_Name workstations;
 		NTTIME last_logon;
 		NTTIME last_logoff;
 		samr_LogonHours logon_hours;
-		uint16 bad_pwd_count;
+		uint16 bad_password_count;
 		uint16 num_logons;
-		NTTIME last_pwd_change;
+		NTTIME last_password_change;
 		NTTIME acct_expiry;
 		uint32 acct_flags;
 	} samr_UserInfo5;
 
 	typedef struct {
-		samr_Name username;
+		samr_Name account_name;
 		samr_Name full_name;
 	} samr_UserInfo6;
 
 	typedef struct {
-		samr_Name username;
+		samr_Name account_name;
 	} samr_UserInfo7;
 
 	typedef struct {
@@ -664,7 +664,7 @@
 	} samr_UserInfo11;
 
 	typedef struct {
-		samr_Name profile;
+		samr_Name profile_path;
 	} samr_UserInfo12;
 
 	typedef struct {
@@ -692,7 +692,7 @@
 	const int SAMR_FIELD_DESCRIPTION  = 0x00000010;
 	const int SAMR_FIELD_COMMENT      = 0x00000020;
 	const int SAMR_FIELD_LOGON_SCRIPT = 0x00000100;
-	const int SAMR_FIELD_PROFILE      = 0x00000200;
+	const int SAMR_FIELD_PROFILE_PATH = 0x00000200;
 	const int SAMR_FIELD_WORKSTATION  = 0x00000400;
 	const int SAMR_FIELD_LOGON_HOURS  = 0x00002000;
 	const int SAMR_FIELD_CALLBACK     = 0x00200000;
@@ -703,16 +703,16 @@
 	typedef struct {
 		NTTIME last_logon;
 		NTTIME last_logoff;
-		NTTIME last_pwd_change;
+		NTTIME last_password_change;
 		NTTIME acct_expiry;
-		NTTIME allow_pwd_change;
-		NTTIME force_pwd_change;
-		samr_Name username;
+		NTTIME allow_password_change;
+		NTTIME force_password_change;
+		samr_Name account_name;
 		samr_Name full_name;
 		samr_Name home_directory;
 		samr_Name home_drive;
 		samr_Name logon_script;
-		samr_Name profile;
+		samr_Name profile_path;
 		samr_Name description;
 		samr_Name workstations;
 		samr_Name comment;
@@ -727,12 +727,12 @@
 		uint32 acct_flags;
 		uint32 fields_present;
 		samr_LogonHours logon_hours;
-		uint16 bad_pwd_count;
+		uint16 bad_password_count;
 		uint16 num_logons;
 		uint16 country_code;
 		uint16 code_page;
-		uint8  nt_pwd_set;
-		uint8  lm_pwd_set;
+		uint8  nt_password_set;
+		uint8  lm_password_set;
 		uint8  expired_flag;
 		uint8  unknown4;
 	} samr_UserInfo21;
@@ -964,7 +964,7 @@
 	const uint32 DOMAIN_REFUSE_PASSWORD_CHANGE   = 0x00000020;
 
 	typedef struct {
-		uint16 min_pwd_len;
+		uint16 min_password_len;
 		uint32 password_properties;
 	} samr_PwInfo;
 
@@ -1039,7 +1039,7 @@
 	/* Function    0x32     */
 	NTSTATUS samr_CreateUser2(
 		[in,ref]      policy_handle *handle,
-		[in,ref]      samr_Name *username,
+		[in,ref]      samr_Name *account_name,
 		[in]          uint32 acct_flags,
 		[in]          uint32 access_mask,
 		[out,ref]     policy_handle *acct_handle,
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index b4dbfbb5a5..ebfcdf7ff3 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -128,7 +128,7 @@ NTSTATUS dcerpc_schannel_key(struct dcerpc_pipe *p,
 			  negotiate_flags);
 
 	a.in.server_name = r.in.server_name;
-	a.in.username = talloc_asprintf(p->mem_ctx, "%s$", workstation);
+	a.in.account_name = talloc_asprintf(p->mem_ctx, "%s$", workstation);
 	a.in.secure_channel_type = chan_type;
 	a.in.computer_name = workstation;
 	a.in.negotiate_flags = &negotiate_flags;