diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/configure.in globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/configure.in --- globus_2_4_3/gridftp/gsi-wuftpd/source/configure.in Sat Mar 23 02:18:57 2002 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/configure.in Tue Nov 25 00:20:43 2003 @@ -28,7 +28,7 @@ # If you did not receive a copy of the license, it may be obtained online # at http://www.wu-ftpd.org/license.html. # -# $Id: configure.in,v 1.24 2002/03/23 01:18:57 meder Exp $ +# $Id: configure.in,v 1.24.54.2 2003/11/24 22:35:20 mlink Exp $ # undivert(0) @@ -1040,6 +1040,45 @@ AC_DEFINE(USE_ETC) +dnl mlink 11/24/03 +dnl proper version info never made it into 2.4 branch, +dnl add this here to fill in the string in src/vers.c +dnl =========================================================================== +dnl hubbard 7/29/02, adding version info from GPT and dirt.sh + +if test "x$GLOBUS_LOCATION" = "x"; then + echo "ERROR Please specify GLOBUS_LOCATION" >&2 + exit 1 +fi +if test "x$GPT_LOCATION" = "x"; then + GPT_LOCATION=$GLOBUS_LOCATION + export GPT_LOCATION +fi + +$GPT_LOCATION/sbin/gpt_extract_data --name --version $srcdir/pkg_data_src.gpt > tmpfile.gpt +. ./tmpfile.gpt +rm ./tmpfile.gpt + +GPT_VERSION="$GPT_MAJOR_VERSION.$GPT_MINOR_VERSION" + +dnl export version information +dnl branch id 99999 means that timestamp refers to build time +if test -f $srcdir/dirt.sh ; then + . $srcdir/dirt.sh +else + DIRT_TIMESTAMP=`perl -e 'print time'` + DIRT_BRANCH_ID=99999 +fi + +dnl GPT_MAJOR_VERSION and GPT_MINOR_VERSION provided by GPT_INIT +AC_SUBST(GPT_MAJOR_VERSION) +AC_SUBST(GPT_MINOR_VERSION) +AC_SUBST(DIRT_TIMESTAMP) +AC_SUBST(DIRT_BRANCH_ID) +AC_SUBST(GLOBUS_FLAVOR_NAME) + +dnl end of hubbard changes, except for addition of vers.c below + dnl =========================================================================== dnl Write results... dnl ============================================================================ @@ -1050,4 +1089,4 @@ mkdir util fi -AC_OUTPUT(Makefile Doxyfile src/Makefile support/Makefile util/privatepw/Makefile src/pathnames.h) +AC_OUTPUT(Makefile Doxyfile src/Makefile support/Makefile util/privatepw/Makefile src/pathnames.h src/vers.c util/privatepw/vers.c) diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/dirt.sh globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/dirt.sh --- globus_2_4_3/gridftp/gsi-wuftpd/source/dirt.sh Wed Sep 3 18:34:49 2003 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/dirt.sh Tue Nov 25 00:20:43 2003 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1062606889 +DIRT_TIMESTAMP=1069715860 DIRT_BRANCH_ID=42 diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/pkg_data_src.gpt globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/pkg_data_src.gpt --- globus_2_4_3/gridftp/gsi-wuftpd/source/pkg_data_src.gpt Wed Sep 3 18:34:48 2003 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/pkg_data_src.gpt Tue Nov 25 00:20:43 2003 @@ -1,7 +1,7 @@ - + Globus binary package for gsi-wuftpd diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/ftpcmd.y globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/ftpcmd.y --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/ftpcmd.y Thu Jun 19 19:32:05 2003 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/ftpcmd.y Tue Nov 25 00:20:43 2003 @@ -20,7 +20,7 @@ If you did not receive a copy of the license, it may be obtained online at http://www.wu-ftpd.org/license.html. - $Id: ftpcmd.y,v 1.42.12.1 2003/06/19 17:32:05 kettimut Exp $ + $Id: ftpcmd.y,v 1.42.12.2 2003/11/06 20:09:37 mlink Exp $ ****************************************************************************/ /* @@ -494,6 +494,7 @@ case PROT_P: globus_ftp_control_local_prot(&g_data_handle, GLOBUS_FTP_CONTROL_PROTECTION_PRIVATE); + break; case PROT_S: globus_ftp_control_local_prot(&g_data_handle, GLOBUS_FTP_CONTROL_PROTECTION_SAFE); diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/ftpd.c globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/ftpd.c --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/ftpd.c Wed Apr 23 03:57:44 2003 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/ftpd.c Tue Nov 25 00:20:43 2003 @@ -21,7 +21,7 @@ If you did not receive a copy of the license, it may be obtained online at http://www.wu-ftpd.org/license.html. - $Id: ftpd.c,v 1.54 2003/04/23 01:57:44 meder Exp $ + $Id: ftpd.c,v 1.54.2.1 2003/11/24 22:51:30 mlink Exp $ ****************************************************************************/ /* FTP server. */ @@ -1464,9 +1464,10 @@ else if (!strcasecmp(ARG0, "brief")) version_option = 1; } - switch (version_option) { + version_option = 0; + switch (version_option) { default: - reply(220, "%s FTP server (%s) ready.", hostname, version); + reply(220, "%s %s ready.", hostname, version); break; case 1: reply(220, "%s FTP server ready.", hostname); diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/globus_hack.c globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/globus_hack.c --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/globus_hack.c Thu Aug 28 07:57:48 2003 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/globus_hack.c Tue Nov 25 00:20:43 2003 @@ -1654,11 +1654,11 @@ &five_seconds, globus_l_wu_perf_update_callback, &g_monitor); + globus_l_wu_perf_update(&g_monitor); + g_monitor.callback_count = 0; #ifndef BUILD_LITE /** XXX JoeL */ - globus_l_wu_perf_update(&g_monitor); - g_monitor.callback_count = 0; for(ctr = 0; ctr < data_connection_count; ctr++) { #endif @@ -2144,7 +2144,7 @@ } static int -globus_l_wu_count_digits(int num) +globus_l_wu_count_digits(globus_off_t num) { int digits = 1; @@ -2362,7 +2362,7 @@ } ctr = 0; - g_mountPts = malloc(sizeof(char *) * 32); + g_mountPts = malloc(sizeof(char *) * max_mpt_ptrs); fp = popen("mount | awk '{print $3}'", "r"); while(fgets(buf, 80, fp)) { @@ -2370,7 +2370,7 @@ if(ctr >= max_mpt_ptrs) { max_mpt_ptrs *= 2; - g_mountPts = realloc(g_mountPts, max_mpt_ptrs); + g_mountPts = realloc(g_mountPts, sizeof(char *) * max_mpt_ptrs); } g_mountPts[ctr] = strdup(buf); ctr++; diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/gssapi-local.h globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/gssapi-local.h --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/gssapi-local.h Thu Oct 11 20:27:44 2001 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/gssapi-local.h Tue Nov 25 00:20:43 2003 @@ -15,6 +15,10 @@ int gssapi_wrap_message(); int gssapi_can_encrypt(); int gssapi_handle_auth_data(); +int gssapi_fix_env(); +int gssapi_remove_delegation(); + +int gssapi_chown_delegation(uid_t uid, gid_t gid); #ifdef GSSAPI_GLOBUS char *globus_local_name(); diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/gssapi.c globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/gssapi.c --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/gssapi.c Wed Aug 28 23:05:59 2002 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/gssapi.c Tue Nov 25 00:20:43 2003 @@ -6,13 +6,14 @@ */ #include "config.h" - +#include "proto.h" #ifdef GSSAPI #ifdef GSSAPI_KRB5 #include #endif /* GSSAPI_KRB5 */ +#include "gssapi-local.h" #include "secure_ext.h" #include /* For syslog() */ @@ -140,7 +141,7 @@ * Fix up our environment */ int -gssapi_fix_env(void) +gssapi_fix_env() { int status = 0; @@ -232,7 +233,7 @@ * Remove the forwarded proxy credentials */ int -gssapi_remove_delegation(void) +gssapi_remove_delegation() { char *envstr; int envstr_index; diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/newvers.sh globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/newvers.sh --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/newvers.sh Fri Aug 16 09:02:04 2002 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/newvers.sh Tue Nov 25 00:20:43 2003 @@ -21,14 +21,14 @@ # If you did not receive a copy of the license, it may be obtained online # at http://www.wu-ftpd.org/license.html. # -# $Id: newvers.sh,v 1.16 2002/08/16 07:02:04 link Exp $ +# $Id: newvers.sh,v 1.16.24.1 2003/11/24 22:19:03 mlink Exp $ # -if [ ! -r edit ]; then echo 0 > edit; fi -touch edit -awk ' { edit = $1 + 2; }\ -END { printf "char version[] = \"GridFTP Server 1.5 " > "vers.c";\ +#if [ ! -r edit ]; then echo 0 > edit; fi +#touch edit +#awk ' { edit = $1 + 2; }\ +#END { printf "char version[] = \"GridFTP Server 1.5 " > "vers.c";\ #LANG= #LC_TIME= - printf "[GSI patch v0.5] wu-2.6.2(%d) ", edit >> "vers.c";\ - printf "%d\n", edit > "edit"; }' < edit -echo `LC_TIME=C date`'";' >> vers.c +# printf "[GSI patch v0.5] wu-2.6.2(%d) ", edit >> "vers.c";\ +# printf "%d\n", edit > "edit"; }' < edit +#echo `LC_TIME=C date`'";' >> vers.c diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/radix.h globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/radix.h --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/radix.h Thu Jan 1 01:00:00 1970 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/radix.h Tue Nov 25 00:20:43 2003 @@ -0,0 +1,11 @@ + +#ifndef __RADIX_H__ +#define __RADIX_H__ + +int radix_encode(unsigned char inbuf[], + unsigned char outbuf[], + int *len, int decode); + +char * radix_error(int e); + +#endif diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/secure_ext.c globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/secure_ext.c --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/secure_ext.c Thu May 17 22:54:49 2001 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/secure_ext.c Tue Nov 25 00:20:43 2003 @@ -5,11 +5,18 @@ */ #include "config.h" +#include "proto.h" #ifdef FTP_SECURITY_EXTENSIONS #include "secure_ext.h" +#ifdef GSSAPI +# include "gssapi-local.h" +#endif + +#include "radix.h" + #include /* For syslog() */ #include #include diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/secure_ext.h globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/secure_ext.h --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/secure_ext.h Mon Jun 2 15:45:40 2003 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/secure_ext.h Tue Nov 25 00:20:43 2003 @@ -29,9 +29,12 @@ int auth_data(char * data); int pbsz(char * size_string); int send_adat_reply(int code, unsigned char * data, int length); - - - +int encode_secure_message(char *message, + char *smessage, + int smessage_size); +int decode_secure_message(char *smessage, + char *message, + int message_size); /* * Protection levels */ diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/src/vers.c.in globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/vers.c.in --- globus_2_4_3/gridftp/gsi-wuftpd/source/src/vers.c.in Thu Jan 1 01:00:00 1970 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/src/vers.c.in Tue Nov 25 00:20:43 2003 @@ -0,0 +1,15 @@ +#include "config.h" + +char version[] = "GridFTP Server @GPT_MAJOR_VERSION@.@GPT_MINOR_VERSION@" +#ifdef GLOBUS_AUTHORIZATION + " CAS enabled" +#endif + " GSSAPI type" +#ifdef GSSAPI_GLOBUS + " Globus/GSI" +#endif +#ifdef GSSAPI_KRB5 + " Kerberos 5" +#endif +" wu-2.6.2 (@GLOBUS_FLAVOR_NAME@, @DIRT_TIMESTAMP@-@DIRT_BRANCH_ID@)"; + diff -urN globus_2_4_3/gridftp/gsi-wuftpd/source/util/privatepw/vers.c.in globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/util/privatepw/vers.c.in --- globus_2_4_3/gridftp/gsi-wuftpd/source/util/privatepw/vers.c.in Thu Jan 1 01:00:00 1970 +++ globus_2_4_3_adv2003/gridftp/gsi-wuftpd/source/util/privatepw/vers.c.in Tue Nov 25 00:20:43 2003 @@ -0,0 +1,15 @@ +#include "config.h" + +char version[] = "GridFTP Server @GPT_MAJOR_VERSION@.@GPT_MINOR_VERSION@" +#ifdef GLOBUS_AUTHORIZATION + " CAS enabled" +#endif + " GSSAPI type" +#ifdef GSSAPI_GLOBUS + " Globus/GSI" +#endif +#ifdef GSSAPI_KRB5 + " Kerberos 5" +#endif +" wu-2.6.2 (@GLOBUS_FLAVOR_NAME@, @DIRT_TIMESTAMP@-@DIRT_BRANCH_ID@)"; +