Attachment 157978 Details for Bug 244749 – cvs diffs (adminserver)

[patch] cvs diffs (adminserver)

pta.diffs (text/plain), 7.74 KB, created by Noriko Hosoi on 2007-06-27 02:23:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-27 02:23:01 UTC

Size: 7.74 KB

patch

obsolete

>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.18
>diff -t -w -U4 -r1.18 Makefile.am
>--- Makefile.am	26 Jun 2007 18:34:46 -0000	1.18
>+++ Makefile.am	27 Jun 2007 02:17:18 -0000
>@@ -138,8 +138,10 @@
>         admserv/schema/ldif/10dsdata.ldif.tmpl \
>         admserv/schema/ldif/11dstasks.ldif.tmpl \
>         admserv/schema/ldif/12dsconfig.mod.tmpl \
>         admserv/schema/ldif/13dsschema.mod.tmpl \
>+        admserv/schema/ldif/14dsmonitor.mod.tmpl \
>+        admserv/schema/ldif/15dspta.ldif.tmpl \
>         admserv/schema/ldif/20asdata.ldif.tmpl \
>         admserv/schema/ldif/21astasks.ldif.tmpl \
>         admserv/schema/ldif/22ascommands.ldif.tmpl
> 
>@@ -436,8 +438,9 @@
>         -e 's,@mimemagic\@,$(mimemagic),g' \
>         -e 's,@initdir\@,$(initdir),g' \
>         -e 's,@perldir\@,$(perldir),g' \
>         -e 's,@infdir\@,$(infdir),g' \
>+        -e 's,@dslibdir\@,$(dslibdir),g' \
>         -e 's,@ldifdir\@,$(ldifdir),g'
> 
> # because the source may be either httpd.conf.in or httpd-2.2.conf.in
> admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
>Index: admserv/newinst/src/AdminUtil.pm.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 AdminUtil.pm.in
>--- admserv/newinst/src/AdminUtil.pm.in	25 Jun 2007 17:14:40 -0000	1.4
>+++ admserv/newinst/src/AdminUtil.pm.in	27 Jun 2007 02:17:18 -0000
>@@ -253,9 +253,10 @@
>     # add the o=NetscapeRoot tree using the mapper and ldif templates
>     my @ldiffiles = ('@ldifdir@/01nsroot.ldif.tmpl',
>                      '@ldifdir@/02globalpreferences.ldif.tmpl',
>                      '@ldifdir@/12dsconfig.mod.tmpl',
>-                     '@ldifdir@/13dsschema.mod.tmpl'
>+                     '@ldifdir@/13dsschema.mod.tmpl',
>+                     '@ldifdir@/14dsmonitor.mod.tmpl'
>                      );
>     my $setupinf = new Inf("@infdir@/setup.inf");
>     my $admininf = new Inf("@infdir@/admin.inf");
>     my $dsinf = new Inf("@infdir@/slapd.inf");
>@@ -274,8 +275,47 @@
>     $conn->close();
>     return 1;
> }
> 
>+# Take the slapd server instance specified in the slapd section of the given inf
>+# and make it into a subordinative directory server
>+# (no o=netscaperoot, with PTA setup)
>+sub createSubDS {
>+    my $inf = shift;
>+    my $errs = shift;
>+
>+    # open a connection to the directory server
>+    my $conn = new Mozilla::LDAP::Conn($inf->{General}->{FullMachineName},
>+                                       $inf->{slapd}->{ServerPort},
>+                                       $inf->{slapd}->{RootDN},
>+                                       $inf->{slapd}->{RootDNPwd},
>+                                       $inf->{General}->{certdir});
>+
>+    # add the o=NetscapeRoot tree using the mapper and ldif templates
>+    my @ldiffiles = ('@ldifdir@/12dsconfig.mod.tmpl',
>+                     '@ldifdir@/13dsschema.mod.tmpl',
>+                     '@ldifdir@/14dsmonitor.mod.tmpl',
>+                     '@ldifdir@/15dspta.ldif.tmpl'
>+                     );
>+    my $setupinf = new Inf("@infdir@/setup.inf");
>+    my $admininf = new Inf("@infdir@/admin.inf");
>+    my $dsinf = new Inf("@infdir@/slapd.inf");
>+    my $mapper = new Inf("@infdir@/dirserver.map");
>+
>+    $mapper = process_maptbl($mapper, ($inf, $dsinf, $admininf, $setupinf));
>+    if (!$mapper) {
>+        $conn->close();
>+        @{$errs} = ('error_creating_configds_maptbl');
>+        return 0;
>+    }
>+
>+    getMappedEntries($mapper, \@ldiffiles, \&check_and_add_entry,
>+                     [$conn]);
>+
>+    $conn->close();
>+    return 1;
>+}
>+
> sub updateAdmConf {
>     my $params = shift; # hashref
>     my $configdir = shift || "@configdir@";
>     my $admConf = getAdmConf($configdir);
>Index: admserv/newinst/src/dirserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 dirserver.map.in
>--- admserv/newinst/src/dirserver.map.in	25 Jun 2007 18:23:53 -0000	1.4
>+++ admserv/newinst/src/dirserver.map.in	27 Jun 2007 02:17:18 -0000
>@@ -72,4 +72,5 @@
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
> ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
> ds_sie =                "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>+config_ds_url = ConfigDirectoryLdapURL
>Index: admserv/newinst/src/register_param.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 register_param.map.in
>--- admserv/newinst/src/register_param.map.in	25 Jun 2007 18:23:53 -0000	1.4
>+++ admserv/newinst/src/register_param.map.in	27 Jun 2007 02:17:18 -0000
>@@ -90,4 +90,5 @@
> ds_buildnum =   BuildNumber
> ds_passwd =             RootDNPwd
> ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
> ds_sie =                "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>+config_ds_url = ConfigDirectoryLdapURL
>
>========================================
>admserv/schema/ldif/14dsmonitor.mod.tmpl
>========================================
># BEGIN COPYRIGHT BLOCK
># Copyright (C) 2007 Red Hat, Inc.
># All rights reserved.
>#
># This program is free software; you can redistribute it and/or
># modify it under the terms of the GNU General Public License
># as published by the Free Software Foundation; either version 2
># of the License, or (at your option) any later version.
>#
># This program is distributed in the hope that it will be useful,
># but WITHOUT ANY WARRANTY; without even the implied warranty of
># MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
># GNU General Public License for more details.
>#
># You should have received a copy of the GNU General Public License
># along with this program; if not, write to the Free Software
># Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>#
># END COPYRIGHT BLOCK
>dn: cn=monitor
>changetype: modify
>add: aci
>aci: (target ="ldap:///cn=monitor*")(targetattr != "aci || connection")(version 3.0; acl "monitor"; allow( read, search, compare ) userdn = "ldap:///anyone";)
>
>========================================
>admserv/schema/ldif/15dspta.ldif.tmpl.in
>========================================
># BEGIN COPYRIGHT BLOCK
># Copyright (C) 2007 Red Hat, Inc.
># All rights reserved.
>#
># This program is free software; you can redistribute it and/or
># modify it under the terms of the GNU General Public License
># as published by the Free Software Foundation; either version 2
># of the License, or (at your option) any later version.
>#
># This program is distributed in the hope that it will be useful,
># but WITHOUT ANY WARRANTY; without even the implied warranty of
># MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
># GNU General Public License for more details.
>#
># You should have received a copy of the GNU General Public License
># along with this program; if not, write to the Free Software
># Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>#
># END COPYRIGHT BLOCK
>dn: cn=Pass Through Authentication,cn=plugins,cn=config
>objectClass: top
>objectClass: nsSlapdPlugin
>objectClass: extensibleObject
>cn: Pass Through Authentication
>nsslapd-pluginPath: @dslibdir@/plugins/libpassthru-plugin.so
>nsslapd-pluginInitfunc: passthruauth_init
>nsslapd-pluginType: preoperation
>nsslapd-pluginEnabled: on
>nsslapd-pluginarg0: %config_ds_url%/o%3DNetscapeRoot
>nsslapd-plugin-depends-on-type: database
>nsslapd-pluginId: passthruauth
>nsslapd-pluginVersion: %ds_version%
>nsslapd-pluginVendor: %vendor%
>nsslapd-pluginDescription: pass through authentication plugin
>

Actions: View | Diff

Attachments on bug 244749: 157336 | 157497 | 157506 | 157508 | 157554 | 157578 | 157579 | 157588 | 157662 | 157664 | 157671 | 157769 | 157772 | 157779 | 157978 | 158034 | 158070 | 158071 | 158140 | 158148