2009/12/13 ld_stop処理にてReal削除不可対応

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel@9123 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/l7directord/l7directord b/l7directord/l7directord
index 5ef5f4d..03665db 100644 (file)
--- a/l7directord/l7directord
+++ b/l7directord/l7directord
@@ -1327,7 +1327,7 @@ sub ld_setup {
                     $v->{option}{flags} .= ' -q ' . $v->{qosdown};
                 }
                 if ( defined $v->{sslconfigfile} ) {
-                    $v->{option}{flags} .= ' -S ' . $v->{sslconfigfile};
+                    $v->{option}{flags} .= ' -z ' . $v->{sslconfigfile};
                     $v->{other_virtual_key} .= ' ' . $v->{sslconfigfile};
                 }
                 else {
@@ -1841,6 +1841,10 @@ sub ld_start {
     
             # remove remaining entries for real servers
             for my $remove_real_ip_port (keys %$or) {
+                if ( !is_ip ($remove_real_ip_port) 
+                  && !is_ip6($remove_real_ip_port)){
+                    next;
+                }
                 ld_delete_real( $nv, $or->{$remove_real_ip_port} );
                 delete $or->{$remove_real_ip_port};
             }
@@ -1931,6 +1935,11 @@ sub ld_stop {
             }
             if ( exists $srv->{$vid} ) {
                 for my $rid ( keys %{ $srv->{$vid} } ) {
+                    if ( defined $rid 
+                      ||(!is_ip ($rid)
+                      && !is_ip6($rid))){
+                        next;
+                    }
                     ld_delete_real( $v, $srv->{$vid}{$rid} );
                 }
             }