oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fixes.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@403 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Unknown User d91-jda
1996-04-18 01:58:26 +00:00
parent e8dc095707
commit 589c09c41d
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
appl/ftp/ftpd/auth.c
View File

@@ -52,6 +52,11 @@ void delete_ftp_command(void)
} }
} }
int auth_ok(void)
{
return ct && auth_complete;
}
void auth(char *auth) void auth(char *auth)
{ {
for(ct=auth_types; ct->name; ct++){ for(ct=auth_types; ct->name; ct++){
@@ -74,7 +79,7 @@ void adat(char *auth)
void pbsz(int size) void pbsz(int size)
{ {
int old = buffer_size; int old = buffer_size;
if(ct && auth_complete) if(auth_ok())
ct->pbsz(size); ct->pbsz(size);
else else
reply(503, "Incomplete security data exchange."); reply(503, "Incomplete security data exchange.");
@@ -111,7 +116,7 @@ void prot(char *pl)
return; return;
} }
if(ct && auth_complete){ if(auth_ok()){
if(ct->prot(p)){ if(ct->prot(p)){
reply(536, "%s does not support %s protection.", reply(536, "%s does not support %s protection.",
ct->name, protection_names[p]); ct->name, protection_names[p]);
@@ -127,7 +132,7 @@ void prot(char *pl)
void ccc(void) void ccc(void)
{ {
if(ct && auth_complete){ if(auth_ok()){
if(!ct->ccc()) if(!ct->ccc())
prot_level = prot_clear; prot_level = prot_clear;
}else }else
@@ -136,7 +141,7 @@ void ccc(void)
void mic(char *msg) void mic(char *msg)
{ {
if(ct && auth_complete){ if(auth_ok()){
if(!ct->mic(msg)) if(!ct->mic(msg))
prot_level = prot_safe; prot_level = prot_safe;
}else }else
@@ -145,7 +150,7 @@ void mic(char *msg)
void conf(char *msg) void conf(char *msg)
{ {
if(ct && auth_complete){ if(auth_ok()){
if(!ct->conf(msg)) if(!ct->conf(msg))
prot_level = prot_confidential; prot_level = prot_confidential;
}else }else
@@ -154,7 +159,7 @@ void conf(char *msg)
void enc(char *msg) void enc(char *msg)
{ {
if(ct && auth_complete){ if(auth_ok()){
if(!ct->enc(msg)) if(!ct->enc(msg))
prot_level = prot_private; prot_level = prot_private;
}else }else
@@ -163,7 +168,7 @@ void enc(char *msg)
int auth_read(int fd, void *data, int length) int auth_read(int fd, void *data, int length)
{ {
if(ct && auth_complete && data_protection) if(auth_ok() && data_protection)
return ct->read(fd, data, length); return ct->read(fd, data, length);
else else
return read(fd, data, length); return read(fd, data, length);
@@ -171,7 +176,7 @@ int auth_read(int fd, void *data, int length)
int auth_write(int fd, void *data, int length) int auth_write(int fd, void *data, int length)
{ {
if(ct && auth_complete && data_protection) if(auth_ok() && data_protection)
return ct->write(fd, data, length); return ct->write(fd, data, length);
else else
return write(fd, data, length); return write(fd, data, length);
@@ -179,7 +184,7 @@ int auth_write(int fd, void *data, int length)
void auth_vprintf(const char *fmt, va_list ap) void auth_vprintf(const char *fmt, va_list ap)
{ {
if(ct && auth_complete && prot_level){ if(auth_ok() && prot_level){
ct->vprintf(fmt, ap); ct->vprintf(fmt, ap);
}else }else
vprintf(fmt, ap); vprintf(fmt, ap);

2
appl/ftp/ftpd/auth.h
View File

@@ -37,6 +37,8 @@ extern int auth_complete;
void auth_init(void); void auth_init(void);
int auth_ok(void);
void auth(char*); void auth(char*);
void adat(char*); void adat(char*);
void pbsz(int); void pbsz(int);