diff options
| author | Jeremy Allison <jra@samba.org> | 2001-03-11 00:32:10 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-03-11 00:32:10 +0000 |
| commit | da3053048c3d224a20d6383ac6682d31059cd46c (patch) | |
| tree | e0608d0bb47fcf3b6228db16507d3263afb869bd /source3/web | |
| parent | 1af77d39fa69d201be739e379d8bf4a370fc2df1 (diff) | |
| download | samba-da3053048c3d224a20d6383ac6682d31059cd46c.tar.gz samba-da3053048c3d224a20d6383ac6682d31059cd46c.tar.bz2 samba-da3053048c3d224a20d6383ac6682d31059cd46c.zip | |
Merge of new 2.2 code into HEAD (Gerald I hate you :-) :-). Allows new SAMR
RPC code to merge with new passdb code.
Currently rpcclient doesn't compile. I'm working on it...
Jeremy.
(This used to be commit 0be41d5158ea4e645e93e8cd30617c038416e549)
Diffstat (limited to 'source3/web')
| -rw-r--r-- | source3/web/cgi.c | 3 | ||||
| -rw-r--r-- | source3/web/swat.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c index f85ba7bebd..e4fda2d99c 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -332,7 +332,6 @@ static BOOL cgi_handle_authorization(char *line) { char *p, *user, *user_pass; struct passwd *pass = NULL; - BOOL ret = False; BOOL got_name = False; BOOL tested_pass = False; fstring default_user_lookup; @@ -378,7 +377,7 @@ static BOOL cgi_handle_authorization(char *line) tested_pass = True; - if((ret = pass_check(user, user_pass, strlen(user_pass), NULL, NULL)) == True) { + if(pass_check(user, user_pass, strlen(user_pass), NULL, NULL) == True) { /* * Password was ok. diff --git a/source3/web/swat.c b/source3/web/swat.c index d0a78fb243..1e8d23f6e3 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -50,8 +50,8 @@ static int iNumNonAutoPrintServices = 0; #define RHOST "remote_host" /* we need these because we link to locking*.o */ - void become_root(BOOL save_dir) {} - void unbecome_root(BOOL restore_dir) {} + void become_root(void) {} + void unbecome_root(void) {} /**************************************************************************** ****************************************************************************/ |