[26077] in Source-Commits
/svn/athena r25378 - in trunk/athena/bin/getcluster: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Aug 11 16:26:43 2011
Date: Thu, 11 Aug 2011 16:26:37 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108112026.p7BKQbiY024042@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-11 16:26:36 -0400 (Thu, 11 Aug 2011)
New Revision: 25378
Modified:
trunk/athena/bin/getcluster/debian/changelog
trunk/athena/bin/getcluster/getcluster.1
trunk/athena/bin/getcluster/getcluster.c
Log:
In getcluster:
* Quote shell output (Trac: #1037)
* Update the man page for the 21st century (Trac: #964)
Modified: trunk/athena/bin/getcluster/debian/changelog
===================================================================
--- trunk/athena/bin/getcluster/debian/changelog 2011-08-11 18:38:31 UTC (rev 25377)
+++ trunk/athena/bin/getcluster/debian/changelog 2011-08-11 20:26:36 UTC (rev 25378)
@@ -1,3 +1,10 @@
+debathena-getcluster (10.0.1-0debathena1) unstable; urgency=low
+
+ * Quote shell output (Trac: #1037)
+ * Update the man page for the 21st century (Trac: #964)
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 11 Aug 2011 16:26:14 -0400
+
debathena-getcluster (10.0.0-0debathena2) unstable; urgency=low
* Change DEB_AUTO_UPDATE_AUTOCONF to 2.50, not 1.
Modified: trunk/athena/bin/getcluster/getcluster.1
===================================================================
--- trunk/athena/bin/getcluster/getcluster.1 2011-08-11 18:38:31 UTC (rev 25377)
+++ trunk/athena/bin/getcluster/getcluster.1 2011-08-11 20:26:36 UTC (rev 25378)
@@ -36,7 +36,7 @@
.B getcluster
looks up cluster information for the current hostname. This name may
be overridden by the contents of the file
-.B /etc/athena/cluster
+.B /etc/cluster
or via the command line using the
.B \-h
option. A cluster name such as
@@ -44,12 +44,12 @@
may be given in place of a hostname.
.PP
If
-.B /etc/athena/cluster.fallback
+.B /etc/cluster.fallback
is present, that file is read and the cluster records in it are
considered lower priority than the Hesiod cluster records. For each
variable name in the Hesiod cluster record, no record with the same
variable name in the fallback file will be considered. If
-.B /etc/athena/cluster.local
+.B /etc/cluster.local
is present, that file is read and the cluster records in it are
considered higher priority than the Hesiod cluster records and
fallback cluster records.
@@ -122,9 +122,9 @@
is usually invoked from
.I save_cluster_info (8),
which places its output in the files
-.I /var/athena/clusterinfo
+.I /var/run/athena-clusterinfo.csh
and
-.I /var/athena/clusterinfo.bsh
+.I /var/run/athena-clusterinfo.sh
to be accessed by the C shell in a user's .login file and the Bourne
shell in a user's .profile, respectively. It may also be invoked
directly by any user.
@@ -161,3 +161,6 @@
Copyright 1987, 1997, Massachusetts Institute of Technology
.br
.SH BUGS
+If there exist two unversioned tags of the same name, getcluster will
+pick whichever one comes last (either in Hesiod output or in a local
+file). This can be regarded as a feature instead of a bug.
Modified: trunk/athena/bin/getcluster/getcluster.c
===================================================================
--- trunk/athena/bin/getcluster/getcluster.c 2011-08-11 18:38:31 UTC (rev 25377)
+++ trunk/athena/bin/getcluster/getcluster.c 2011-08-11 20:26:36 UTC (rev 25378)
@@ -421,9 +421,9 @@
static void output_var(const char *var, const char *val, int bourneshell)
{
if (bourneshell)
- printf("%s=%s ; export %s ;\n", var, val, var);
+ printf("%s=\"%s\" ; export %s ;\n", var, val, var);
else
- printf("setenv %s %s ;\n", var, val);
+ printf("setenv %s \"%s\" ;\n", var, val);
}
static void upper(char *v)
