diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-08-27 23:01:56 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-08-27 23:01:56 +0000 |
| commit | 8eed0d0aef3d03f247def819ca1eb23bddf767e1 (patch) | |
| tree | d5729de3a343feebaa7dd52af3363c64fd95f1fe /src/appl | |
| parent | 6fcba05976f7e6eb2518f715be68d48fa680bf34 (diff) | |
Finally applied patch from Nalin Dahyabhai at Red Hat to fix 0/NULL bugs in
variadic argument lists to krb5_build_principal{,_ext}. Skipped the stylistic
patches that removed casts of NULL.
tag: 1850
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16693 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 6 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpd.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 1112b3fd0..8038333cb 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,9 @@ +2004-08-27 Ken Raeburn <raeburn@mit.edu> + + * ftpd.c (ftpd_gss_convert_creds): Terminate argument list to + krb5_build_principal_ext with 0, not NULL. Patch from Nalin + Dahyabhai. + 2004-08-27 Sam Hartman <hartmans@mit.edu> * ftpd.c (passwd;): Patch from Garry Zacheiss to use diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index eabc74fbb..6048278d7 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -2954,7 +2954,7 @@ ftpd_gss_convert_creds(name, creds) 6, "krbtgt", krb5_princ_realm(kcontext, me)->length, krb5_princ_realm(kcontext, me)->data, - NULL)) + 0)) goto cleanup; memset((char *) &increds, 0, sizeof(increds)); |