Attachment 160834 Details for Bug 251090 – cvs diff DSCreate.pm.in

[patch] cvs diff DSCreate.pm.in

DSCreate.pm.in.diff (text/plain), 2.36 KB, created by Noriko Hosoi on 2007-08-07 18:15:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-08-07 18:15:49 UTC

Size: 2.36 KB

patch

obsolete

>Index: DSCreate.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 DSCreate.pm.in
>--- DSCreate.pm.in	2 Aug 2007 14:39:01 -0000	1.4
>+++ DSCreate.pm.in	7 Aug 2007 18:14:27 -0000
>@@ -52,9 +52,9 @@
> # tempfiles
> use File::Temp qw(tempfile tempdir);
> use File::Path;
> use File::Copy;
>-use File::Basename qw(basename);
>+use File::Basename qw(basename dirname);
> 
> # load perldap
> use Mozilla::LDAP::Conn;
> use Mozilla::LDAP::Utils qw(normalizeDN);
>@@ -134,12 +134,16 @@
> 
> sub getMode {
>     my $inf = shift;
>     my $mode = shift;
>+    my $rest = shift;
>+    if (!$rest) {
>+        $rest = "0";
>+    }
>     if (defined($inf->{General}->{SuiteSpotGroup})) {
>-        $mode = "0" . $mode . $mode . "0";
>+        $mode = "0" . $mode . $mode . $rest;
>     } else {
>-        $mode = "0" . $mode . "00";
>+        $mode = "0" . $mode . $rest . $rest;
>     }
> 
>     return oct($mode);
> }
>@@ -151,24 +155,29 @@
> sub changeOwnerMode {
>     my $inf = shift;
>     my $mode = shift;
>     my $it = shift;
>+    my $gidonly = shift;
> 
>     my $uid = getpwnam $inf->{General}->{SuiteSpotUserID};
>     my $gid = -1; # default to leave it alone
> 
>     if (defined($inf->{General}->{SuiteSpotGroup})) {
>         $gid = getgrnam $inf->{General}->{SuiteSpotGroup};
>     }
> 
>-    $mode = getMode($inf, $mode);
>+    $mode = getMode($inf, $mode, $gidonly);
>     $! = 0; # clear errno
>     chmod $mode, $it;
>     if ($!) {
>         return ('error_chmoding_file', $it, $!);
>     }
>     $! = 0; # clear errno
>+    if ( $gidonly ) {
>+        chown -1, $gid, $it;
>+    } else {
>     chown $uid, $gid, $it;
>+    }
>     if ($!) {
>         return ('error_chowning_file', $it, $inf->{General}->{SuiteSpotUserID}, $!);
>     }
> 
>@@ -194,8 +203,20 @@
>         if (@errs) {
>             return @errs;
>         }
>     }
>+    # set the group of the parent dir of config_dir and inst_dir
>+    if (defined($inf->{General}->{SuiteSpotGroup})) {
>+        for (qw(inst_dir config_dir)) {
>+            my $dir = $inf->{slapd}->{$_};
>+            my $parent = dirname($dir);
>+                  # changeOwnerMode(inf, mode, file, gidonly & default mode);
>+            @errs = changeOwnerMode($inf, 7, $parent, 5);
>+            if (@errs) {
>+                return @errs;
>+            }
>+        }
>+    }
> 
>     return @errs;
> }
>

Actions: View | Diff

Attachments on bug 251090: 160789 | 160834 | 160835 | 160872 | 208571 | 208641 | 208681