Changeset 1161

Timestamp:

06/21/08 19:31:02 (7 months ago)

Author:

shibuya

Message:

- version 2.66-0BQ18
- fixed exportPlatform check routine.
- fixed the issue that doesn't import admin user without root access.
- fixed the chown issue that the gid isn't defined.
- fixed the issue that doesn't enable SSL.
- fixed the issue to import the suspended user.
- fixed the issue that the value is 0 isn't exported
- doesn't output error message for exporting admin user.

Files:

• utils/cmu/trunk/Makefile (modified) (5 diffs)
• utils/cmu/trunk/cobalt-cmu.spec.in (modified) (2 diffs)
• utils/cmu/trunk/perl_modules/Archive.pm (modified) (2 diffs)
• utils/cmu/trunk/perl_modules/TreeXml.pm (modified) (3 diffs)
• utils/cmu/trunk/perl_modules/cmuCCE.pm (modified) (1 diff)
• utils/cmu/trunk/scripts/5100Radjust.pl (modified) (1 diff)
• utils/cmu/trunk/scripts/5100Rscanin.pl (modified) (1 diff)
• utils/cmu/trunk/scripts/5100Rscanout.pl (modified) (3 diffs)
• utils/cmu/trunk/scripts/cmuImport (modified) (2 diffs)

utils/cmu/trunk/Makefile

@@ -11 +11 @@
-INSTALL = /usr/bin/install
-
-5
+6
-
-BUILD_DIR =   /tmp/cmu
@@ -239 +239 @@
-        /bin/tar -X $(TMP_DIR)/ignore -C $(BUILD_DIR) -czvf $(TMPTAR) cpr
-        $(RPMBUILD) -ta $(TMPTAR)
-        perl -pi -e 's#\[VERSION\]#$(VERSION)#' $(PKG_DIR)/5100R/packing_list
-        (cd $(PKG_DIR)/5100R;make)
-
-5200r:: cmu base adjust
@@ -255 +253 @@
-        /bin/tar -X $(TMP_DIR)/ignore -C $(BUILD_DIR) -czvf $(TMPTAR) cpr
-        $(RPMBUILD) -ta $(TMPTAR)
-        perl -pi -e 's#\[VERSION\]#$(VERSION)#' $(PKG_DIR)/5200R/packing_list
-        (cd $(PKG_DIR)/5200R;make)
-
-tlas1he:: cmu base adjust
@@ -271 +267 @@
-        /bin/tar -X $(TMP_DIR)/ignore -C $(BUILD_DIR) -czvf $(TMPTAR) cpr
-        $(RPMBUILD) -ta $(TMPTAR)
-        perl -pi -e 's#\[VERSION\]#$(VERSION)#' $(PKG_DIR)/5100R/packing_list
-        (cd $(PKG_DIR)/TLAS1HE;make)
-
-tlas2:: cmu base adjust
@@ -287 +281 @@
-        /bin/tar -X $(TMP_DIR)/ignore -C $(BUILD_DIR) -czvf $(TMPTAR) cpr
-        $(RPMBUILD) -ta $(TMPTAR)
-        perl -pi -e 's#\[VERSION\]#$(VERSION)#' $(PKG_DIR)/5100R/packing_list
-        (cd $(PKG_DIR)/TLAS2;make)
-
-qube2:: cmu base

utils/cmu/trunk/cobalt-cmu.spec.in

@@ -4 +4 @@
-Name: [PRODUCT]-cmu
-Version: [VERSION]
-7
+8
-Vendor: %{vendor}
-License: Sun modified BSD
@@ -68 +68 @@
-
-%changelog
+* Sat Jun 21 2008 Hisao SHIBUYA <shibuya@bluequartz.org>
+- version 2.66-0BQ18
+- fixed exportPlatform check routine.
+- fixed the issue that doesn't import admin user without root access.
+- fixed the chown issue that the gid isn't defined.
+- fixed the issue that doesn't enable SSL.
+- fixed the issue to import the suspended user.
+- fixed the issue that the value is 0 isn't exported
+- doesn't output error message for exporting admin user.
+
-* Sun Jan 27 2008 Hisao SHIBUYA <shibuya@bluequartz.org>
-- version 2.65-0BQ17

utils/cmu/trunk/perl_modules/Archive.pm

@@ -518 +518 @@
-                }
-
+                my $gid;
+                if (defined $self->{gid}) {
+                        $gid = $self->{gid};
+                } else {
+                        $gid = 'users';
+                }
+
-                # escape problem chars
-                if($file->{name} =~ /\$/) { $file->{name} =~ s/\$/\\\$/g; }
@@ -524 +531 @@
-                if($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^5200R/ || $self->build =~ /^TLAS1HE/ || $self->build =~ /^TLAS2/) {
-                        $ret = chown((getpwnam($file->{uid}))[2],
-self->{gid}
+gid
-                        $ret = ($ret > 0)? 0: 1;
-                } elsif($self->build =~ /^Qube/) { 

utils/cmu/trunk/perl_modules/TreeXml.pm

@@ -24 +24 @@
-                $XMLHEADER
-);      
-53
+66
-
-use vars qw($XMLPROLOG $XMLHEADER $KEYATTR);
@@ -226 +226 @@
-    my @attrs = [];
-
-[0-9]+HE
+1HE/ || $data->{exportPlatform} =~ /TLAS2
-        @attrs = qw(vsite user list);
-    }
@@ -385 +385 @@
-                    push @nested, @{ TreeXml::asXml($val, $key, "$indent  ") };
-                }
-$val
+defined($val)
-                    $val = escText($val);
-                    push @result, $indent, qq(   <$key value = "$val"/>\n);

utils/cmu/trunk/perl_modules/cmuCCE.pm

@@ -170 +170 @@
-
-        foreach my $attr (keys %{ $curObj }) {
-
+ ne ''
-                if(exists($self->{_arrayVal}->{$attr})) {
-                        # to make more this readable

utils/cmu/trunk/scripts/5100Radjust.pl

@@ -25 +25 @@
-$tree->{adjustPlatform} = "5100R";
-
+if(defined $tree->{user}) {
+my($uTree, $fqdn, @arr);
+my @keys = keys %{ $tree->{user} };
+foreach my $user (@keys) {
+        $uTree = $tree->{user}->{$user};
+
+        # Check suspend user
+        if (!defined($uTree->{enabled})) {
+                $uTree->{enabled} = 0;
+        }
+        if (!defined($uTree->{ui_enabled})) {
+                $uTree->{ui_enabled} = 0;
+        }
+}
+}
+
+if(defined $tree->{list}) {
+my($lTree, $fqdn, @arr);
+my @keys = keys %{ $tree->{list} };
+foreach my $list (@keys) {
+        $lTree = $tree->{list}->{$list};
+
+        # Check reply policy
+        if (!defined($lTree->{replyToList})) {
+                $lTree->{replyToList} = 0;
+        }
+}
+}
+
+
+if(defined $tree->{vsite}) {
+my $vTree;
+my @keys = keys %{ $tree->{vsite} };
+foreach my $vsite (@keys) {
+        $vTree = $tree->{vsite}->{$vsite};
+        if(defined $vTree->{SSL}->{importCert}) {
+                delete $vTree->{SSL}->{importCert}
+        }
+}
+}
+
-my $migrate = {};
-TreeXml::addNode('migrate', $tree, $migrate);

utils/cmu/trunk/scripts/5100Rscanin.pl

@@ -162 +162 @@
-        # convert into fqdn into site
-        my $vsites;
+
+        # check adminUser
+        my $admin;
+        if (defined $uTree->{capLevels}) {
+                my @arr = @{ $uTree->{capLevels}->{cap} };
+
+                for(my $i = 0; $i < @arr; $i++) {
+                        if($uTree->{capLevels}->{cap}->[$i] eq 'adminUser') {
+                                $admin = 1;
+                        }
+                }
+        }
+
-        if(defined $uRef->{fqdn}) {
-                ($uRef->{site}) = $cce->findMember("Vsite", 

utils/cmu/trunk/scripts/5100Rscanout.pl

@@ -108 +108 @@
-                $vobj->{archives} = $arch->archives;
-        }
+        if(defined $vobj->{SSL}->{importCert}) {
+                delete $vobj->{SSL}->{importCert};
+        }
+
-        push @{ $tree->{migrate}->{vsite} }, $vobj;
-}
@@ -119 +123 @@
-
-    my $key = $cceRef->{name};
+        # check adminUser
+        my $admin;
+        if ($cceRef->{capLevels} =~ /&adminUser&/) {
+                $admin = 1;
+        }
+
-        warn "INFO: exporting user $key\n";
-        ($fqdn) = $cce->findMember("Vsite", 
@@ -125 +135 @@
-                'fqdn'
-        );
-
+ && !$admin
-                warn "ERROR: cannot retrieve virtual site for user ",
-                        $cceRef->{name}, "\n";

utils/cmu/trunk/scripts/cmuImport

@@ -87 +87 @@
-my ($pid, $adjustCmd);
-# cobaltBase adjust
+cmuLog("INFO", "Adjustment : Platform = " . $migrate->{adjustPlatform} . " build = $build\n");
-if($cfg->skipAdjust eq 't') {
-        cmuLog("WARN","Skipping adjust script\n");
@@ -105 +106 @@
-                $adjustCmd = "/usr/cmu/scripts/".
-                        $adjustPath{ $migrate->{adjustPlatform} }."adjust.pl";
+                cmuLog("INFO", "AdjustCommand = $adjustCmd\n");
-                if(! -x $adjustCmd) {
-                        cmuLog("ERROR", "Cannot adjust to this platform\n");