[Fedora-directory-commits] adminserver/admserv/newinst/src ConfigDSDialogs.pm, 1.2, 1.3

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115

Modified Files:
	ConfigDSDialogs.pm 
Log Message:
Resolves: #237356
Summary: Move DS Admin Code into Admin Server
Description: fixing Administration Domain [com] ===> Administration Domain [<domainname>]



Index: ConfigDSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ConfigDSDialogs.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigDSDialogs.pm	19 Jun 2007 18:32:28 -0000	1.2
+++ ConfigDSDialogs.pm	19 Jun 2007 23:06:43 -0000	1.3
@@ -111,7 +111,7 @@
             if (!defined($admindomain)) {
                 $admindomain = $self->{manager}->{inf}->{General}->{FullMachineName} ||
                     hostfqdn;
-                $admindomain =~ s/^.*\.//; # just the domain part
+                $admindomain =~ s/^[^\.]*\.//; # just the domain part
             }
             return $admindomain;
         } else { # the CA cert
@@ -242,7 +242,7 @@
         if (!defined($admindomain)) {
             $admindomain = $self->{manager}->{inf}->{General}->{FullMachineName} ||
                 hostfqdn;
-            $admindomain =~ s/^.*\.//; # just the domain part
+            $admindomain =~ s/^[^\.]*\.//; # just the domain part
         }
         return $admindomain;
     },