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

make compile

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-07-30 14:25:12 +02:00
parent 00658426b2
commit 11024751a5
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/ftp/ftpd/ftpd.c
View File

@@ -1111,10 +1111,14 @@ do_store(char *name, char *mode, int unique)
if(guest && filename_check(name))
return;
if (unique && stat(name, &st) == 0 &&
(name = gunique(name)) == NULL) {
LOGCMD(*mode == 'w' ? "put" : "append", name);
return;
if (unique) {
char *uname;
if (stat(name, &st) == 0) {
if ((uname = gunique(name)) == NULL)
return;
name = uname;
}
LOGCMD(*mode == 'w' ? "put" : "append", name);
}
if (restart_point)

6
lib/krb5/recvauth.c
View File

@@ -195,7 +195,7 @@ krb5_recvauth_match_version(krb5_context context,
if (krb5_net_write (context, p_fd, &len, 4) != 4) {
ret = errno;
krb5_set_error_message(context, ret, "write: %s", strerror(ret));
krb5_free_ticket(*ticket);
krb5_free_ticket(context, *ticket);
*ticket = NULL;
return ret;
}
@@ -203,14 +203,14 @@ krb5_recvauth_match_version(krb5_context context,
if (ap_options & AP_OPTS_MUTUAL_REQUIRED) {
ret = krb5_mk_rep (context, *auth_context, &data);
if (ret) {
krb5_free_ticket(*ticket);
krb5_free_ticket(context, *ticket);
*ticket = NULL;
return ret;
}
ret = krb5_write_message (context, p_fd, &data);
if (ret) {
krb5_free_ticket(*ticket);
krb5_free_ticket(context, *ticket);
*ticket = NULL;
return ret;
}