Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

protogeni/lib/GeniAuthority.pm.in

@@ -556,9 +556,16 @@ sub Resolve($$)
 #
 # Discover resources at an authority (CM).
 #
-sub DiscoverResources($$)
+sub DiscoverResources($$;$$)
 {
-    my ($self, $urn) = @_;
+    my ($self, $urn, $available, $compress) = @_;
+
+    if (! defined($available)) {
+	$available = 1;
+    }
+    if (! defined($compress)) {
+	$compress = 0;
+    }
 
     my $manager_version = $self->Version();
     return undef
@@ -586,7 +593,8 @@ sub DiscoverResources($$)
     my $method_args;
     if ($manager_version == 2.0) {
 	$method_args->{'credentials'} = [$credential->asString()];
-	$method_args->{'available'}   = 1;
+	$method_args->{'available'}   = $available;
+	$method_args->{'compress'}    = $compress;
     }
     else {
 	print STDERR "GeniAuthority::Discover: Unknown version at $self\n";

protogeni/scripts/ch_daemon.in

@@ -14,7 +14,7 @@ use Getopt::Std;
 #
 sub usage()
 {
-    print "Usage: ch_daemon [-d] [-n]\n";
+    print "Usage: ch_daemon [-s] [-d] [-n]\n";
     exit(1);
 }
 my $optlist   = "dns";
@@ -183,7 +183,7 @@ sub ProbeCMs()
 	# Discover resources and cache; for the map client.
 	# Returns a string of xml.
 	#
-	my $resources = $authority->DiscoverResources();
+	my $resources = $authority->DiscoverResources(undef, 0);
 	# Errors will go to the log.
 	next
 	    if (!defined($resources));