The branch, v3-2-test has been updated
via 0b630db298a863ca5e38c9ee7b0202a58c51c6d1 (commit)
from 232a505535de04121a631b3bb24a2700df07ee1e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0b630db298a863ca5e38c9ee7b0202a58c51c6d1
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 14:40:39 2008 +0100
Remove trailing whitespace in samr client and server.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/rpc_server/srv_samr_util.c | 100 ++++++------
source/rpcclient/cmd_samr.c | 296 ++++++++++++++++++------------------
2 files changed, 198 insertions(+), 198 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_samr_util.c
b/source/rpc_server/srv_samr_util.c
index c8f7321..0b7cbbe 100644
--- a/source/rpc_server/srv_samr_util.c
+++ b/source/rpc_server/srv_samr_util.c
@@ -1,22 +1,22 @@
-/*
+/*
Unix SMB/CIFS implementation.
SAMR Pipe utility functions.
-
+
Copyright (C) Luke Kenneth Casson Leighton 1996-1998
Copyright (C) Gerald (Jerry) Carter 2000-2001
Copyright (C) Andrew Bartlett 2001-2002
Copyright (C) Stefan (metze) Metzmacher 2002
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -72,14 +72,14 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
const char *old_string, *new_string;
DATA_BLOB mung;
- if (from == NULL || to == NULL)
+ if (from == NULL || to == NULL)
return;
if (from->fields_present & ACCT_LAST_LOGON) {
unix_time=nt_time_to_unix(from->logon_time);
stored_time = pdb_get_logon_time(to);
DEBUG(10,("INFO_21 LOGON_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
}
@@ -87,7 +87,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
unix_time=nt_time_to_unix(from->logoff_time);
stored_time = pdb_get_logoff_time(to);
DEBUG(10,("INFO_21 LOGOFF_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
}
@@ -95,15 +95,15 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
unix_time=nt_time_to_unix(from->kickoff_time);
stored_time = pdb_get_kickoff_time(to);
DEBUG(10,("INFO_21 KICKOFF_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
- }
+ }
if (from->fields_present & ACCT_LAST_PWD_CHANGE) {
unix_time=nt_time_to_unix(from->pass_last_set_time);
stored_time = pdb_get_pass_last_set_time(to);
DEBUG(10,("INFO_21 PASS_LAST_SET: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
}
@@ -124,7 +124,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
if (STRING_CHANGED)
pdb_set_fullname(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_HOME_DIR) &&
(from->hdr_home_dir.buffer)) {
old_string = pdb_get_homedir(to);
@@ -160,7 +160,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
if (STRING_CHANGED)
pdb_set_profile_path(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_DESCRIPTION) &&
(from->hdr_acct_desc.buffer)) {
old_string = pdb_get_acct_desc(to);
@@ -169,7 +169,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
if (STRING_CHANGED)
pdb_set_acct_desc(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_WORKSTATIONS) &&
(from->hdr_workstations.buffer)) {
old_string = pdb_get_workstations(to);
@@ -187,7 +187,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
if (STRING_CHANGED)
pdb_set_comment(to, new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_CALLBACK) &&
(from->hdr_munged_dial.buffer)) {
char *newstr;
@@ -203,7 +203,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
TALLOC_FREE(newstr);
}
-
+
if (from->fields_present & ACCT_RID) {
if (from->user_rid == 0) {
DEBUG(10, ("INFO_21: Asked to set User RID to 0 !?
Skipping change!\n"));
@@ -211,7 +211,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
DEBUG(10,("INFO_21 USER_RID: %u -> %u NOT
UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
}
}
-
+
if (from->fields_present & ACCT_PRIMARY_GID) {
if (from->group_rid == 0) {
DEBUG(10, ("INFO_21: Asked to set Group RID to 0 !?
Skipping change!\n"));
@@ -220,7 +220,7 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
pdb_set_group_sid_from_rid(to, from->group_rid,
PDB_CHANGED);
}
}
-
+
if (from->fields_present & ACCT_FLAGS) {
DEBUG(10,("INFO_21 ACCT_CTRL: %08X ->
%08X\n",pdb_get_acct_ctrl(to),from->acb_info));
if (from->acb_info != pdb_get_acct_ctrl(to)) {
@@ -270,13 +270,13 @@ void copy_id21_to_sam_passwd(struct samu *to,
SAM_USER_INFO_21 *from)
}
/* If the must change flag is set, the last set time goes to zero.
- the must change and can change fields also do, but they are
+ the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_21 PASS_MUST_CHANGE_AT_NEXT_LOGON:
%02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
- pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
+ pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
}
@@ -296,14 +296,14 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
const char *old_string, *new_string;
DATA_BLOB mung;
- if (from == NULL || to == NULL)
+ if (from == NULL || to == NULL)
return;
if (from->fields_present & ACCT_LAST_LOGON) {
unix_time=nt_time_to_unix(from->logon_time);
stored_time = pdb_get_logon_time(to);
DEBUG(10,("INFO_23 LOGON_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
}
@@ -311,23 +311,23 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
unix_time=nt_time_to_unix(from->logoff_time);
stored_time = pdb_get_logoff_time(to);
DEBUG(10,("INFO_23 LOGOFF_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
}
-
+
if (from->fields_present & ACCT_EXPIRY) {
unix_time=nt_time_to_unix(from->kickoff_time);
stored_time = pdb_get_kickoff_time(to);
DEBUG(10,("INFO_23 KICKOFF_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
- }
+ }
if (from->fields_present & ACCT_LAST_PWD_CHANGE) {
unix_time=nt_time_to_unix(from->pass_last_set_time);
stored_time = pdb_get_pass_last_set_time(to);
DEBUG(10,("INFO_23 PASS_LAST_SET: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
}
@@ -349,7 +349,7 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
if (STRING_CHANGED)
pdb_set_fullname(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_HOME_DIR) &&
(from->hdr_home_dir.buffer)) {
old_string = pdb_get_homedir(to);
@@ -385,7 +385,7 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
if (STRING_CHANGED)
pdb_set_profile_path(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_DESCRIPTION) &&
(from->hdr_acct_desc.buffer)) {
old_string = pdb_get_acct_desc(to);
@@ -394,7 +394,7 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
if (STRING_CHANGED)
pdb_set_acct_desc(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_WORKSTATIONS) &&
(from->hdr_workstations.buffer)) {
old_string = pdb_get_workstations(to);
@@ -412,7 +412,7 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
if (STRING_CHANGED)
pdb_set_comment(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_CALLBACK) &&
(from->hdr_munged_dial.buffer)) {
char *newstr;
@@ -428,7 +428,7 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
TALLOC_FREE(newstr);
}
-
+
if (from->fields_present & ACCT_RID) {
if (from->user_rid == 0) {
DEBUG(10, ("INFO_23: Asked to set User RID to 0 !?
Skipping change!\n"));
@@ -445,7 +445,7 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
pdb_set_group_sid_from_rid(to, from->group_rid,
PDB_CHANGED);
}
}
-
+
if (from->fields_present & ACCT_FLAGS) {
DEBUG(10,("INFO_23 ACCT_CTRL: %08X ->
%08X\n",pdb_get_acct_ctrl(to),from->acb_info));
if (from->acb_info != pdb_get_acct_ctrl(to)) {
@@ -484,13 +484,13 @@ void copy_id23_to_sam_passwd(struct samu *to,
SAM_USER_INFO_23 *from)
}
/* If the must change flag is set, the last set time goes to zero.
- the must change and can change fields also do, but they are
+ the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_23 PASS_MUST_CHANGE_AT_NEXT_LOGON:
%02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
- pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
+ pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
}
@@ -509,14 +509,14 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
const char *old_string, *new_string;
DATA_BLOB mung;
- if (from == NULL || to == NULL)
+ if (from == NULL || to == NULL)
return;
if (from->fields_present & ACCT_LAST_LOGON) {
unix_time=nt_time_to_unix(from->logon_time);
stored_time = pdb_get_logon_time(to);
DEBUG(10,("INFO_25 LOGON_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
}
@@ -524,7 +524,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
unix_time=nt_time_to_unix(from->logoff_time);
stored_time = pdb_get_logoff_time(to);
DEBUG(10,("INFO_25 LOGOFF_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
}
@@ -532,15 +532,15 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
unix_time=nt_time_to_unix(from->kickoff_time);
stored_time = pdb_get_kickoff_time(to);
DEBUG(10,("INFO_25 KICKOFF_TIME: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
- }
+ }
if (from->fields_present & ACCT_LAST_PWD_CHANGE) {
unix_time=nt_time_to_unix(from->pass_last_set_time);
stored_time = pdb_get_pass_last_set_time(to);
DEBUG(10,("INFO_25 PASS_LAST_SET: %lu -> %lu\n",(long unsigned
int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ if (stored_time != unix_time)
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
}
@@ -561,7 +561,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
if (STRING_CHANGED)
pdb_set_fullname(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_HOME_DIR) &&
(from->hdr_home_dir.buffer)) {
old_string = pdb_get_homedir(to);
@@ -597,7 +597,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
if (STRING_CHANGED)
pdb_set_profile_path(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_DESCRIPTION) &&
(from->hdr_acct_desc.buffer)) {
old_string = pdb_get_acct_desc(to);
@@ -606,7 +606,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
if (STRING_CHANGED)
pdb_set_acct_desc(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_WORKSTATIONS) &&
(from->hdr_workstations.buffer)) {
old_string = pdb_get_workstations(to);
@@ -624,7 +624,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
if (STRING_CHANGED)
pdb_set_comment(to , new_string, PDB_CHANGED);
}
-
+
if ((from->fields_present & ACCT_CALLBACK) &&
(from->hdr_munged_dial.buffer)) {
char *newstr;
@@ -640,7 +640,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
TALLOC_FREE(newstr);
}
-
+
if (from->fields_present & ACCT_RID) {
if (from->user_rid == 0) {
DEBUG(10, ("INFO_25: Asked to set User RID to 0 !?
Skipping change!\n"));
@@ -648,7 +648,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
DEBUG(10,("INFO_25 USER_RID: %u -> %u NOT
UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
}
}
-
+
if (from->fields_present & ACCT_PRIMARY_GID) {
if (from->group_rid == 0) {
DEBUG(10, ("INFO_25: Asked to set Group RID to 0 !?
Skipping change!\n"));
@@ -657,7 +657,7 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
pdb_set_group_sid_from_rid(to, from->group_rid,
PDB_CHANGED);
}
}
-
+
if (from->fields_present & ACCT_FLAGS) {
DEBUG(10,("INFO_25 ACCT_CTRL: %08X ->
%08X\n",pdb_get_acct_ctrl(to),from->acb_info));
if (from->acb_info != pdb_get_acct_ctrl(to)) {
@@ -702,13 +702,13 @@ void copy_id25_to_sam_passwd(struct samu *to,
SAM_USER_INFO_25 *from)
}
/* If the must change flag is set, the last set time goes to zero.
- the must change and can change fields also do, but they are
+ the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_25 PASS_MUST_CHANGE_AT_NEXT_LOGON:
%02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
- pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
+ pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
}
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index c77d13d..a864874 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
RPC pipe client
@@ -11,12 +11,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -67,60 +67,60 @@ static void display_sam_user_info_21(SAM_USER_INFO_21 *usr)
unistr2_to_ascii(temp, &usr->uni_user_name, sizeof(temp));
printf("\tUser Name :\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_full_name, sizeof(temp));
printf("\tFull Name :\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_home_dir, sizeof(temp));
printf("\tHome Drive :\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_dir_drive, sizeof(temp));
printf("\tDir Drive :\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_profile_path, sizeof(temp));
printf("\tProfile Path:\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_logon_script, sizeof(temp));
printf("\tLogon Script:\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_acct_desc, sizeof(temp));
printf("\tDescription :\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_workstations, sizeof(temp));
printf("\tWorkstations:\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_comment, sizeof(temp));
printf("\tUnknown Str :\t%s\n", temp);
-
+
unistr2_to_ascii(temp, &usr->uni_munged_dial, sizeof(temp));
printf("\tRemote Dial :\t%s\n", temp);
-
- printf("\tLogon Time :\t%s\n",
+
+ printf("\tLogon Time :\t%s\n",
http_timestring(nt_time_to_unix(usr->logon_time)));
- printf("\tLogoff Time :\t%s\n",
+ printf("\tLogoff Time :\t%s\n",
http_timestring(nt_time_to_unix(usr->logoff_time)));
- printf("\tKickoff Time :\t%s\n",
+ printf("\tKickoff Time :\t%s\n",
http_timestring(nt_time_to_unix(usr->kickoff_time)));
- printf("\tPassword last set Time :\t%s\n",
+ printf("\tPassword last set Time :\t%s\n",
http_timestring(nt_time_to_unix(usr->pass_last_set_time)));
- printf("\tPassword can change Time :\t%s\n",
+ printf("\tPassword can change Time :\t%s\n",
http_timestring(nt_time_to_unix(usr->pass_can_change_time)));
- printf("\tPassword must change Time:\t%s\n",
+ printf("\tPassword must change Time:\t%s\n",
http_timestring(nt_time_to_unix(usr->pass_must_change_time)));
-
+
printf("\tunknown_2[0..31]...\n"); /* user passwords? */
-
+
printf("\tuser_rid :\t0x%x\n" , usr->user_rid ); /* User ID */
printf("\tgroup_rid:\t0x%x\n" , usr->group_rid); /* Group ID */
printf("\tacb_info :\t0x%08x\n", usr->acb_info ); /* Account Control
Info */
-
+
printf("\tfields_present:\t0x%08x\n", usr->fields_present); /* 0x00ff
ffff */
printf("\tlogon_divs:\t%d\n", usr->logon_divs); /* 0x0000 00a8 which is
168 which is num hrs in a week */
printf("\tbad_password_count:\t0x%08x\n", usr->bad_password_count);
printf("\tlogon_count:\t0x%08x\n", usr->logon_count);
-
+
printf("\tpadding1[0..7]...\n");
-
+
--
Samba Shared Repository
