|
 |
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath x3270-3.3.10ga4/c3270-3.3/c3270.man
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath 2009-12-07 13:06:22.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/c3270-3.3/c3270.man 2009-12-07 13:09:17.000000000 +0100
|
|
|
e6d3b2 |
@@ -3204,7 +3204,7 @@ backslash character.
|
|
|
e6d3b2 |
If more than one \fB\-xrm\fP option is given for the same resource,
|
|
|
e6d3b2 |
the last one on the command line is used.
|
|
|
e6d3b2 |
.SH "FILES"
|
|
|
e6d3b2 |
-/usr/local/lib/x3270/ibm_hosts
|
|
|
e6d3b2 |
+/etc/ibm_hosts
|
|
|
e6d3b2 |
.br
|
|
|
e6d3b2 |
$HOME/.c3270pro
|
|
|
e6d3b2 |
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/glue.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/glue.c
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/host.c
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath 2009-12-07 13:13:03.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/c3270-3.3/host.c 2009-12-07 13:14:35.000000000 +0100
|
|
|
e6d3b2 |
@@ -126,7 +126,7 @@ hostfile_init(void)
|
|
|
e6d3b2 |
hostfile_initted = True;
|
|
|
e6d3b2 |
hostfile_name = appres.hostsfile;
|
|
|
e6d3b2 |
if (hostfile_name == CN)
|
|
|
e6d3b2 |
- hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir);
|
|
|
e6d3b2 |
+ hostfile_name = xs_buffer("%s/ibm_hosts", "/etc");
|
|
|
e6d3b2 |
else
|
|
|
e6d3b2 |
hostfile_name = do_subst(appres.hostsfile, True, True);
|
|
|
e6d3b2 |
hf = fopen(hostfile_name, "r");
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/Resources.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile.in
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath 2009-12-07 13:06:43.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/c3270-3.3/Makefile.in 2009-12-07 13:12:43.000000000 +0100
|
|
|
e6d3b2 |
@@ -84,10 +84,10 @@ install:: c3270 x3270if
|
|
|
e6d3b2 |
$(INSTALL_PROGRAM) c3270 $(DESTDIR)$(BINDIR)/c3270
|
|
|
e6d3b2 |
$(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if
|
|
|
e6d3b2 |
install::
|
|
|
e6d3b2 |
- [ -d $(DESTDIR)$(LIBX3270DIR) ] || \
|
|
|
e6d3b2 |
- mkdir -p $(DESTDIR)$(LIBX3270DIR)
|
|
|
e6d3b2 |
- [ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \
|
|
|
e6d3b2 |
- $(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts
|
|
|
e6d3b2 |
+ [ -d $(DESTDIR)/etc ] || \
|
|
|
e6d3b2 |
+ mkdir -p $(DESTDIR)/etc
|
|
|
e6d3b2 |
+ [ -r $(DESTDIR)/etc/ibm_hosts ] || \
|
|
|
e6d3b2 |
+ $(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts
|
|
|
e6d3b2 |
@PR@install::
|
|
|
e6d3b2 |
|
|
|
e6d3b2 |
install.man:
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/s3270-3.3/host.c
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath 2009-12-07 13:17:07.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/s3270-3.3/host.c 2009-12-07 13:18:19.000000000 +0100
|
|
|
e6d3b2 |
@@ -126,7 +126,7 @@ hostfile_init(void)
|
|
|
e6d3b2 |
hostfile_initted = True;
|
|
|
e6d3b2 |
hostfile_name = appres.hostsfile;
|
|
|
e6d3b2 |
if (hostfile_name == CN)
|
|
|
e6d3b2 |
- hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir);
|
|
|
e6d3b2 |
+ hostfile_name = xs_buffer("%s/ibm_hosts", "/etc");
|
|
|
e6d3b2 |
else
|
|
|
e6d3b2 |
hostfile_name = do_subst(appres.hostsfile, True, True);
|
|
|
e6d3b2 |
hf = fopen(hostfile_name, "r");
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/s3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/Resources.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath x3270-3.3.10ga4/s3270-3.3/s3270.man
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath 2009-12-07 13:16:49.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/s3270-3.3/s3270.man 2009-12-07 13:18:34.000000000 +0100
|
|
|
e6d3b2 |
@@ -2015,7 +2015,7 @@ the \fBtraceDir\fP resource.
|
|
|
e6d3b2 |
If more than one \fB\-xrm\fP option is given for the same resource,
|
|
|
e6d3b2 |
the last one on the command line is used.
|
|
|
e6d3b2 |
.SH "FILES"
|
|
|
e6d3b2 |
-/usr/local/lib/x3270/ibm_hosts
|
|
|
e6d3b2 |
+/etc/ibm_hosts
|
|
|
e6d3b2 |
.br
|
|
|
e6d3b2 |
|
|
|
e6d3b2 |
.SH "SEE ALSO"
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath x3270-3.3.10ga4/s3270-3.3/X3270.xad
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath 2009-12-07 13:17:00.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/s3270-3.3/X3270.xad 2009-12-07 13:18:45.000000000 +0100
|
|
|
e6d3b2 |
@@ -221,7 +221,7 @@ x3270.charsetList: U.S. English (CP 03
|
|
|
e6d3b2 |
! x3270.doConfirms: true
|
|
|
e6d3b2 |
! x3270.debugTracing: true
|
|
|
e6d3b2 |
! x3270.disconnectClear: false
|
|
|
e6d3b2 |
-! x3270.hostsFile: /usr/lib/X11/x3270/ibm_hosts
|
|
|
e6d3b2 |
+! x3270.hostsFile: /etc/ibm_hosts
|
|
|
e6d3b2 |
! x3270.highlightSelect: true
|
|
|
e6d3b2 |
! x3270.idleCommand:
|
|
|
e6d3b2 |
! x3270.idleTimeout: ~7m
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/Resources.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath 2009-12-07 12:59:42.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man 2009-12-07 13:01:03.000000000 +0100
|
|
|
e6d3b2 |
@@ -3,7 +3,7 @@
|
|
|
e6d3b2 |
.SH "NAME"
|
|
|
e6d3b2 |
ibm_hosts \- host database for x3270 and c3270
|
|
|
e6d3b2 |
.SH "SYNOPSIS"
|
|
|
e6d3b2 |
-/usr/lib/X11/x3270/ibm_hosts
|
|
|
e6d3b2 |
+/etc/ibm_hosts
|
|
|
e6d3b2 |
.SH "DESCRIPTION"
|
|
|
e6d3b2 |
The \fBibm_hosts\fP
|
|
|
e6d3b2 |
file contains information regarding IBM hosts on the network.
|
|
|
e6d3b2 |
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em
|
|
|
e6d3b2 |
enter the string `3' on the second data-entry field on the screen, and
|
|
|
e6d3b2 |
send the Enter \s-1AID\s+1 sequence.
|
|
|
e6d3b2 |
.SH "FILES"
|
|
|
e6d3b2 |
-/usr/lib/X11/x3270/ibm_hosts
|
|
|
e6d3b2 |
+/etc/ibm_hosts
|
|
|
e6d3b2 |
.SH "SEE ALSO"
|
|
|
e6d3b2 |
x3270(1),
|
|
|
e6d3b2 |
c3270(1)
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Imakefile.in
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath 2009-12-07 12:57:19.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/x3270-3.3/Imakefile.in 2009-12-07 13:03:46.000000000 +0100
|
|
|
e6d3b2 |
@@ -190,8 +190,8 @@ $(DESTDIR)$(FONTINSTDIR)/fonts.dir::
|
|
|
e6d3b2 |
/* Extra install rule for the sample ibm_hosts file (runs only if there is
|
|
|
e6d3b2 |
no ibm_hosts file installed yet). */
|
|
|
e6d3b2 |
install:: $(HOSTSFILE)
|
|
|
e6d3b2 |
- @[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
|
|
|
e6d3b2 |
- $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE)
|
|
|
e6d3b2 |
+ @[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \
|
|
|
e6d3b2 |
+ $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE)
|
|
|
e6d3b2 |
|
|
|
e6d3b2 |
/*
|
|
|
e6d3b2 |
* Install rules for x3270if, x3270-script and ibm_hosts man pages.
|
|
|
e6d3b2 |
@@ -220,8 +220,8 @@ install.byprefix::
|
|
|
e6d3b2 |
$(MKFONTDIR) $(DESTDIR)$(autoconf_fontinstdir)
|
|
|
e6d3b2 |
chmod u=rwx,go=rx $(DESTDIR)$(autoconf_fontinstdir)
|
|
|
e6d3b2 |
chmod a=r $(DESTDIR)$(autoconf_fontinstdir)/fonts.dir
|
|
|
e6d3b2 |
- @[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
|
|
|
e6d3b2 |
- (set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE))
|
|
|
e6d3b2 |
+ @[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \
|
|
|
e6d3b2 |
+ (set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE))
|
|
|
e6d3b2 |
|
|
|
e6d3b2 |
/******************************************************************************
|
|
|
e6d3b2 |
* Clean rules. *
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Makefile.in
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath 2009-12-07 12:59:22.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/x3270-3.3/Makefile.in 2009-12-07 13:16:01.000000000 +0100
|
|
|
e6d3b2 |
@@ -127,10 +127,10 @@ install:: x3270 x3270if
|
|
|
e6d3b2 |
$(INSTALL_PROGRAM) x3270 $(DESTDIR)$(BINDIR)/x3270
|
|
|
e6d3b2 |
$(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if
|
|
|
e6d3b2 |
install::
|
|
|
e6d3b2 |
- [ -d $(DESTDIR)$(LIBX3270DIR) ] || \
|
|
|
e6d3b2 |
- mkdir -p $(DESTDIR)$(LIBX3270DIR)
|
|
|
e6d3b2 |
- [ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \
|
|
|
e6d3b2 |
- $(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts
|
|
|
e6d3b2 |
+ [ -d $(DESTDIR)/etc ] || \
|
|
|
e6d3b2 |
+ mkdir -p $(DESTDIR)/etc
|
|
|
e6d3b2 |
+ [ -r $(DESTDIR)/etc/ibm_hosts ] || \
|
|
|
e6d3b2 |
+ $(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts
|
|
|
e6d3b2 |
install::
|
|
|
e6d3b2 |
[ -d $(DESTDIR)$(CIFONTDIR) ] || \
|
|
|
e6d3b2 |
mkdir -p $(DESTDIR)$(CIFONTDIR)
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/X3270.ad.ibmhostspath x3270-3.3.10ga4/x3270-3.3/X3270.ad
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/x3270-3.3/X3270.xad.ibmhostspath 2009-12-07 12:59:53.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/x3270-3.3/X3270.xad 2009-12-07 13:05:28.000000000 +0100
|
|
|
e6d3b2 |
@@ -214,7 +214,7 @@ x3270.charsetList: U.S. English (CP 03
|
|
|
e6d3b2 |
! x3270.doConfirms: true
|
|
|
e6d3b2 |
! x3270.debugTracing: true
|
|
|
e6d3b2 |
! x3270.disconnectClear: false
|
|
|
e6d3b2 |
-! x3270.hostsFile: /usr/lib/X11/x3270/ibm_hosts
|
|
|
e6d3b2 |
+! x3270.hostsFile: /etc/ibm_hosts
|
|
|
e6d3b2 |
! x3270.highlightSelect: true
|
|
|
e6d3b2 |
! x3270.idleCommand:
|
|
|
e6d3b2 |
! x3270.idleTimeout: ~7m
|
|
|
e6d3b2 |
diff -up x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/x3270.man
|
|
|
e6d3b2 |
--- x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath 2009-12-07 12:59:05.000000000 +0100
|
|
|
e6d3b2 |
+++ x3270-3.3.10ga4/x3270-3.3/x3270.man 2009-12-07 13:05:42.000000000 +0100
|
|
|
e6d3b2 |
@@ -5008,7 +5008,7 @@ T}
|
|
|
e6d3b2 |
The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force
|
|
|
e6d3b2 |
the proxy server to do the hostname resolution for the SOCKS protocol.
|
|
|
e6d3b2 |
.SH "FILES"
|
|
|
e6d3b2 |
-/usr/lib/X11/x3270/ibm_hosts
|
|
|
e6d3b2 |
+/etc/ibm_hosts
|
|
|
e6d3b2 |
.br
|
|
|
e6d3b2 |
$HOME/.x3270pro
|
|
|
e6d3b2 |
|