sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r13316: Let the carnage begin....

Browse Source 
Sync with trunk as off r13315
(This used to be commit 17e63ac4ed)
This commit is contained in:
Gerald Carter
2006-02-03 22:19:41 +00:00
committed by Gerald (Jerry) Carter
parent 21a30a1346
commit 0af1500fc0
185 changed files with 22444 additions and 7323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source3/utils/smbpasswd.c
View File

@ -270,10 +270,11 @@ static char *prompt_for_new_password(BOOL stdin_get)
Change a password either locally or remotely.
*************************************************************/
static BOOL password_change(const char *remote_mach, char *username,
char *old_passwd, char *new_pw, int local_flags)
static NTSTATUS password_change(const char *remote_mach, char *username,
char *old_passwd, char *new_pw,
int local_flags)
{
BOOL ret;
NTSTATUS ret;
pstring err_str;
pstring msg_str;
@ -281,7 +282,7 @@ static BOOL password_change(const char *remote_mach, char *username,
if (local_flags & (LOCAL_ADD_USER|LOCAL_DELETE_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|
LOCAL_TRUST_ACCOUNT|LOCAL_SET_NO_PASSWORD)) {
/* these things can't be done remotely yet */
return False;
return NT_STATUS_UNSUCCESSFUL;
}
ret = remote_password_change(remote_mach, username,
old_passwd, new_pw, err_str, sizeof(err_str));
@ -370,9 +371,9 @@ static int process_root(int local_flags)
load_interfaces();
}
if (!user_name[0] && (pwd = getpwuid_alloc(geteuid()))) {
if (!user_name[0] && (pwd = getpwuid_alloc(NULL, geteuid()))) {
fstrcpy(user_name, pwd->pw_name);
passwd_free(&pwd);
talloc_free(pwd);
}
if (!user_name[0]) {
@ -465,7 +466,9 @@ static int process_root(int local_flags)
}
}
if (!password_change(remote_machine, user_name, old_passwd, new_passwd, local_flags)) {
if (!NT_STATUS_IS_OK(password_change(remote_machine, user_name,
old_passwd, new_passwd,
local_flags))) {
fprintf(stderr,"Failed to modify password entry for user %s\n", user_name);
result = 1;
goto done;
@ -512,10 +515,10 @@ static int process_nonroot(int local_flags)
}
if (!user_name[0]) {
pwd = getpwuid_alloc(getuid());
pwd = getpwuid_alloc(NULL, getuid());
if (pwd) {
fstrcpy(user_name,pwd->pw_name);
passwd_free(&pwd);
talloc_free(pwd);
} else {
fprintf(stderr, "smbpasswd: cannot lookup user name for uid %u\n", (unsigned int)getuid());
exit(1);
@ -549,7 +552,8 @@ static int process_nonroot(int local_flags)
exit(1);
}
if (!password_change(remote_machine, user_name, old_pw, new_pw, 0)) {
if (!NT_STATUS_IS_OK(password_change(remote_machine, user_name, old_pw,
new_pw, 0))) {
fprintf(stderr,"Failed to change password for %s\n", user_name);
result = 1;
goto done;