STABLE14-h-enumerate-less-heavyhanded-check-20080201

LICENSE IPL10

if hostCount is too small this is fine or at least not fatal

(cherry picked from commit 4fe2978f69f6314284d5689ea1d9169360155450)

diff --git a/doc/man-pages/pod8/bosserver.pod b/doc/man-pages/pod8/bosserver.pod
index 3ff4345f34aa56370c22ec654e064086b9148046..5e7ca4261f8eee9a14b3f41ded49a0aef3d4d197 100644 (file)
--- a/doc/man-pages/pod8/bosserver.pod
+++ b/doc/man-pages/pod8/bosserver.pod
@@ -8,7 +8,7 @@ bosserver - Initializes the BOS Server
 <div class="synopsis">
 
 B<bosserver> [B<-noauth>] [B<-log>] [B<-enable_peer_stats>]
-    [B<-enable_process_stats>] [B<-allow-dotted-principal>] [B<-help>]
+    [B<-enable_process_stats>] [B<-help>]
 
 =for html
 </div>

diff --git a/doc/man-pages/pod8/fileserver.pod b/doc/man-pages/pod8/fileserver.pod
index 50f3463077ad10aec0035a49349235da1f065947..663e8c556565f9294fecc727d36da346b387ae17 100644 (file)
--- a/doc/man-pages/pod8/fileserver.pod
+++ b/doc/man-pages/pod8/fileserver.pod
@@ -20,7 +20,6 @@ B<fileserver> S<<< [B<-auditlog> <I<path to log file>>] >>>
     S<<< [B<-busyat> <I<< redirect clients when queue > n >>>] >>>
     [B<-nobusy>] S<<< [B<-rxpck> <I<number of rx extra packets>>] >>>
     [B<-rxdbg>] [B<-rxdbge>] S<<< [B<-rxmaxmtu> <I<bytes>>] >>>
-    [B<-allow-dotted-principal>]
     S<<< [B<-rxbind> <I<address to bind the Rx socket to>>] >>>
     S<<< [B<-vattachpar> <I<number of volume attach threads>>] >>>
     S<<< [B<-m> <I<min percentage spare in partition>>] >>>

diff --git a/doc/man-pages/pod8/ptserver.pod b/doc/man-pages/pod8/ptserver.pod
index b5214d2960e545ae39a6a58ceae0557cab9fb004..cfad4f54d177b066faa070e3e813c1248e3b46d5 100644 (file)
--- a/doc/man-pages/pod8/ptserver.pod
+++ b/doc/man-pages/pod8/ptserver.pod
@@ -9,7 +9,7 @@ ptserver - Initializes the Protection Server
 
 B<ptserver> S<<< [B<-database> <I<db path>>] >>> S<<< [B<-p> <I<number of processes>>] >>>
     [B<-rebuildDB>] [B<-enable_peer_stats>] [B<-enable_process_stats>]
-    [B<-allow-dotted-principal>] [B<-help>]
+    [B<-help>]
 
 =for html
 </div>

diff --git a/doc/man-pages/pod8/vlserver.pod b/doc/man-pages/pod8/vlserver.pod
index 9d1e893d40a1b46c39ac04f248d814b4c40175e4..3b5d804cdd96958ac0445f4896fa3acdbfd8eadd 100644 (file)
--- a/doc/man-pages/pod8/vlserver.pod
+++ b/doc/man-pages/pod8/vlserver.pod
@@ -8,8 +8,7 @@ vlserver - Initializes the Volume Location Server
 <div class="synopsis">
 
 B<vlserver> S<<< [B<-p> <I<lwp processes>>] >>> [B<-nojumbo>]
-    [B<-allow-dotted-principal>] [B<-enable_peer_stats>] [B<-enable_process_stats>] 
-    [B<-help>]
+    [B<-enable_peer_stats>] [B<-enable_process_stats>] [B<-help>]
 
 =for html
 </div>

diff --git a/doc/man-pages/pod8/volserver.pod b/doc/man-pages/pod8/volserver.pod
index 0fe4885126f1b2aeb80e3fa19bde95d338094d65..6992cf179a609a16e1c3473e4805d783c46f4fd0 100644 (file)
--- a/doc/man-pages/pod8/volserver.pod
+++ b/doc/man-pages/pod8/volserver.pod
@@ -9,8 +9,7 @@ volserver - Initializes the Volume Server component of the fs process
 
 B<volserver> [B<-log>] S<<< [B<-p> <I<number of processes>>] >>>
     S<<< [B<-udpsize> <I<size of socket buffer in bytes>>] >>>
-    [B<-enable_peer_stats>] [B<-enable_process_stats>] 
-    [B<-allow-dotted-principal>] [B<-help>]
+    [B<-enable_peer_stats>] [B<-enable_process_stats>] [B<-help>]
 
 =for html
 </div>

diff --git a/src/viced/host.c b/src/viced/host.c
index bb80cdfc4040b0e56a59b0ab0d4403d3dcefaad1..0e898988f9243ccf6a178402b6754747eba694c6 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -1071,7 +1071,10 @@ h_Enumerate(int (*proc) (), char *param)
        if (!(held[count] = h_Held_r(host)))
            h_Hold_r(host);
     }
-    assert(count == hostCount);
+    if (count != hostCount) {
+       ViceLog(0, ("h_Enumerate found %d of %d hosts\n", count, hostCount));
+    }
+    assert(count <= hostCount);
     H_UNLOCK;
     for (i = 0; i < count; i++) {
        held[i] = (*proc) (list[i], held[i], param);