Mercurial > gftp.yaz

--- a/ChangeLog	Wed Mar 17 13:03:25 2004 +0000
+++ b/ChangeLog	Wed Mar 17 13:44:43 2004 +0000
@@ -1,4 +1,11 @@
 2004-3-17 Brian Masney <masneyb@gftp.org>
+	* docs/gftp-faq.sgml - added SSL Issues section
+
+	* docs/sample.gftp/gftprc - updated config file that has all
+	of the new options added since 2.0.16
+
+	* lib/options.h - disable show_trans_in_title by default
+
 	* lib/config_file.c lib/gftp.h lib/misc.c lib/protocols.c
 	src/gtk/bookmarks.c (gftp_copy_local_options) - in the new
 	options that are copied, update the the number of options that are
@@ -2299,7 +2306,7 @@

 	* cvsclean - added this script

-	* *.[ch] - added $Id: ChangeLog,v 1.236 2004/03/17 13:03:22 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.237 2004/03/17 13:44:37 masneyb Exp $ tags

 	* debian/* - updated files from Debian maintainer
--- a/docs/gftp-faq.sgml	Wed Mar 17 13:03:25 2004 +0000
+++ b/docs/gftp-faq.sgml	Wed Mar 17 13:44:43 2004 +0000
@@ -6,7 +6,7 @@
 <book>

 <bookinfo>
-  <date>$Date: 2004/01/04 17:23:58 $</date>
+  <date>$Date: 2004/03/17 13:44:41 $</date>
   <title>gFTP FAQ</title>
   <authorgroup>
     <author>
@@ -42,8 +42,8 @@
 package available. If not, you can download the latest version of GTK+ and
 Glib from
 <ulink url="ftp://ftp.gtk.org/pub/gtk">ftp://ftp.gtk.org/pub/gtk</ulink>.
-gFTP will work with either version 1.2 or 2.0 of GTK+, but I would recommend
-using GTK+ 2.0.
+gFTP will work with either version 1.2 or 2.x of GTK+, but I would recommend
+using GTK+ 2.x.
 </simpara></listitem>
 <listitem><simpara>
 pthread libraries. Most systems already satisfy this requirement. If you are
@@ -382,6 +382,23 @@
 <!-- ***************************************************************** -->

 <chapter>
+<title>SSL Issues</title>
+
+<sect1>
+<title>When using the FTPS or HTTPS protocol, gFTP cannot connect if the remote
+server uses a self signed certificate.</title>
+
+<para>You must add the public key of your self signed CA to your OpenSSL
+certs directory. On my Debian box, the OpenSSL certs are installed in
+/usr/lib/ssl/certs.</para>
+
+</sect1>
+
+</chapter>
+
+<!-- ***************************************************************** -->
+
+<chapter>
 <title>Compiling Problems</title>

 <sect1>
--- a/docs/sample.gftp/gftprc	Wed Mar 17 13:03:25 2004 +0000
+++ b/docs/sample.gftp/gftprc	Wed Mar 17 13:44:43 2004 +0000
@@ -44,6 +44,12 @@
 # Show hidden files in the listboxes
 show_hidden_files=1

+# Show the file transfer status in the titlebar
+show_trans_in_title=0
+
+# Allow entering manual commands in the GUI (functions like the text port)
+cmd_in_gui=0
+
 # The timeout waiting for network input/output. This is NOT an idle timeout.
 network_timeout=120

@@ -59,6 +65,9 @@
 # This specifies the default protocol to use
 default_protocol=FTP

+# Enable IPv6 support
+enable_ipv6=1
+
 # This defines what will happen when you double click a file in the file
 # listboxes. 0=View file 1=Edit file 2=Transfer file
 list_dblclk_action=2
@@ -202,6 +211,15 @@
 # this.
 ascii_transfers=0

+# SSL entropy file
+entropy_source=/dev/urandom
+
+# The maximum number of bytes to seed the SSL engine with
+entropy_len=1024
+
+# Verify SSL Peer
+verify_ssl_peer=1
+
 # Firewall hostname
 http_proxy_host=

@@ -217,12 +235,6 @@
 # Do you want to use HTTP/1.1 or HTTP/1.0
 use_http11=1

-# SSL entropy file
-entropy_source=/dev/urandom
-
-# The maximum number of bytes to seed the SSL engine with
-entropy_len=1024
-
 # The path to the SSH executable
 ssh_prog_name=
--- a/lib/options.h	Wed Mar 17 13:03:25 2004 +0000
+++ b/lib/options.h	Wed Mar 17 13:44:43 2004 +0000
@@ -86,7 +86,7 @@
    GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
    N_("Show hidden files in the listboxes"), GFTP_PORT_ALL, NULL},
   {"show_trans_in_title", N_("Show transfer status in title"),
-   gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, 0,
+   gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, 0,
    N_("Show the file transfer status in the titlebar"), GFTP_PORT_GTK, NULL},
   {"cmd_in_gui", N_("Allow manual commands in GUI"),
    gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, 0,