summaryrefslogtreecommitdiff
path: root/source3/web
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-02-03 22:19:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:23 -0500
commit0af1500fc0bafe61019f1b2ab1d9e1d369221240 (patch)
tree653fc2533795458d5f9696402285d9f14e527a21 /source3/web
parent21a30a1346c9f9a25659a0cea0d276d8c2e6ddca (diff)
downloadsamba-0af1500fc0bafe61019f1b2ab1d9e1d369221240.tar.gz
samba-0af1500fc0bafe61019f1b2ab1d9e1d369221240.tar.bz2
samba-0af1500fc0bafe61019f1b2ab1d9e1d369221240.zip
r13316: Let the carnage begin....
Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f)
Diffstat (limited to 'source3/web')
-rw-r--r--source3/web/cgi.c10
-rw-r--r--source3/web/swat.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 6c9cfce13c..700fb7fa08 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -293,7 +293,7 @@ static void cgi_web_auth(void)
exit(0);
}
- pwd = getpwnam_alloc(user);
+ pwd = getpwnam_alloc(NULL, user);
if (!pwd) {
printf("%sCannot find user %s<br>%s\n", head, user, tail);
exit(0);
@@ -306,7 +306,7 @@ static void cgi_web_auth(void)
head, user, (int)geteuid(), (int)getuid(), tail);
exit(0);
}
- passwd_free(&pwd);
+ talloc_free(pwd);
}
@@ -346,7 +346,7 @@ static BOOL cgi_handle_authorization(char *line)
* Try and get the user from the UNIX password file.
*/
- pass = getpwnam_alloc(user);
+ pass = getpwnam_alloc(NULL, user);
/*
* Validate the password they have given.
@@ -367,7 +367,7 @@ static BOOL cgi_handle_authorization(char *line)
/* Save the users name */
C_user = SMB_STRDUP(user);
- passwd_free(&pass);
+ talloc_free(pass);
return True;
}
}
@@ -377,7 +377,7 @@ err:
"WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
"username or password incorrect");
- passwd_free(&pass);
+ talloc_free(pass);
return False;
}
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 63253e41c4..af01d1f31b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -982,7 +982,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
const char *old_passwd, const char *new_passwd,
int local_flags)
{
- BOOL ret = False;
+ NTSTATUS ret;
pstring err_str;
pstring msg_str;
@@ -996,7 +996,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
new_passwd, err_str, sizeof(err_str));
if(*err_str)
printf("%s\n<p>", err_str);
- return ret;
+ return NT_STATUS_IS_OK(ret);
}
if(!initialize_password_db(True)) {
@@ -1012,7 +1012,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
if(*err_str)
printf("%s\n<p>", err_str);
- return ret;
+ return NT_STATUS_IS_OK(ret);
}
/****************************************************************************