assar 2a7f590041 fix conflicts from merge

2000-12-29 21:16:01 +00:00

..

auth.c

…

auth.h

…

extern.h

…

ftpcmd.y

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

ftpd_locl.h

…

ftpd.c

fix conflicts from merge

2000-12-29 21:16:01 +00:00

gss_userok.c

…

kauth.c

…

krb4.c

…

krb4.h

…

logwtmp.c

…

ls.c

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

Makefile.am

…

Makefile.in

…

pathnames.h

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

popen.c

…