Attachment 160996 Details for Bug 251549 – diffs - ldapserver

[patch] diffs - ldapserver

cvsdiffs (text/plain), 8.70 KB, created by Rich Megginson on 2007-08-09 18:18:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-08-09 18:18:59 UTC

Size: 8.70 KB

patch

obsolete

>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.35
>diff -u -8 -r1.35 configure.ac
>--- ldapserver/configure.ac	2 Aug 2007 14:39:00 -0000	1.35
>+++ ldapserver/configure.ac	9 Aug 2007 18:12:46 -0000
>@@ -1,13 +1,13 @@
> #                                               -*- Autoconf -*-
> # Process this file with autoconf to produce a configure script.
> AC_PREREQ(2.59)
> # This version is the version returned by ns-slapd -v
>-AC_INIT([fedora-ds], [1.1.0a4], [http://bugzilla.redhat.com/])
>+AC_INIT([dirsrv], [1.1.0a4], [http://bugzilla.redhat.com/])
> # AC_CONFIG_HEADER must be called right after AC_INIT.
> AC_CONFIG_HEADERS([config.h])
> AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
> AM_MAINTAINER_MODE
> AC_CANONICAL_HOST
> 
> # Checks for programs.
> AC_PROG_CXX
>Index: ldapserver/ldap/admin/src/scripts/Migration.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
>retrieving revision 1.3
>diff -u -8 -r1.3 Migration.pm.in
>--- ldapserver/ldap/admin/src/scripts/Migration.pm.in	13 Jul 2007 18:35:32 -0000	1.3
>+++ ldapserver/ldap/admin/src/scripts/Migration.pm.in	9 Aug 2007 18:12:46 -0000
>@@ -165,25 +165,25 @@
> cross:
> Also known as crossplatform, or 'c', or 'x'.
> This is when the source machine is a different architecture than the
> destination machine.  In this case, only certain data will be available
> for migration.  Changelog information will not be migrated, and replicas
> will need to be reinitialized (if migrating masters or hubs).  This type
> of migration requires that all of your old databases have been dumped
> to LDIF format, and the LDIF file must be in the default database directory
>-(usually /opt/@brand@-ds/slapd-instance/db), and the LDIF file must have
>+(usually /opt/@PACKAGE_NAME@/slapd-instance/db), and the LDIF file must have
> the same name as the database instance directory, with a ".ldif".  For
> example, if you have
>- /opt/@brand@-ds/slapd-instance/db/userRoot/ and
>- /opt/@brand@-ds/slapd-instance/db/NetscapeRoot/
>+ /opt/@PACKAGE_NAME@/slapd-instance/db/userRoot/ and
>+ /opt/@PACKAGE_NAME@/slapd-instance/db/NetscapeRoot/
> you must first use db2ldif to export these databases to LDIF e.g.
>- cd /opt/@brand@-ds/slapd-instance
>- ./db2ldif -n userRoot -a /opt/@brand@-ds/slapd-instance/db/userRoot.ldif and
>- ./db2ldif -n NetscapeRoot -a /opt/@brand@-ds/slapd-instance/db/NetscapeRoot.ldif
>+ cd /opt/@PACKAGE_NAME@/slapd-instance
>+ ./db2ldif -n userRoot -a /opt/@PACKAGE_NAME@/slapd-instance/db/userRoot.ldif and
>+ ./db2ldif -n NetscapeRoot -a /opt/@PACKAGE_NAME@/slapd-instance/db/NetscapeRoot.ldif
> 
> Then you must somehow make your old server root directory available on
> the destination machine, either by creating a tar archive on the source
> and copying it to the destination, or by network mounting the source
> directory on the destination machine.
> EOF
> }
> 
>Index: ldapserver/ldap/servers/slapd/test-plugins/README
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/README,v
>retrieving revision 1.8
>diff -u -8 -r1.8 README
>--- ldapserver/ldap/servers/slapd/test-plugins/README	15 Dec 2006 00:22:54 -0000	1.8
>+++ ldapserver/ldap/servers/slapd/test-plugins/README	9 Aug 2007 18:12:46 -0000
>@@ -183,27 +183,27 @@
> 
> Plugging the Library Into the Server
> ------------------------------------
> When started, the server loads plug-ins.
> 
> 1. Stop the server.
> 
>    Console:      Select the server; Object > Stop Server
>-   Command Line: cd [prefix]/usr/lib/<brand>-ds/slapd-[serverID] ; ./stop-slapd
>+   Command Line: cd [prefix]/usr/lib/<PACKAGE_NAME>/slapd-[serverID] ; ./stop-slapd
> 
> 2. Add the entry for the server plug-in to
>    [prefix]/var/lib/slapd-[serverID]/dse.ldif. For example:
> 
>    dn: cn=[My Server Plugin],cn=plugins,cn=config
>    objectClass: top
>    objectClass: nsSlapdPlugin
>    objectClass: extensibleObject
>    cn: [My Server Plugin]
>-   nsslapd-pluginPath: [[prefix]/usr/lib/<brand>-ds/plugins/myveryown-plugin.so]
>+   nsslapd-pluginPath: [[prefix]/usr/lib/<PACAKGE_NAME>/plugins/myveryown-plugin.so]
>    nsslapd-pluginInitfunc: [my_plugin_init]
>    nsslapd-pluginType: [myPluginType]
>    nsslapd-pluginEnabled: on
>    nsslapd-pluginarg0: [uid]
>    nsslapd-pluginarg1: [mail]
>    nsslapd-pluginarg2: [...]
>    nsslapd-plugin-depends-on-type: [anotherPluginType]
>    nsslapd-pluginId: [MyFirstServerPlugin]
>@@ -212,9 +212,9 @@
>    nsslapd-pluginDescription: [Add lots of cool functionality]
> 
>    See the Parameter Block Reference in the Red Hat Directory Server
>    Plug-In Programmer's Guide for hints on plug-in types.
> 
> 3. Restart the server.
> 
>    Console:      Object > Start Server
>-   Command Line: cd [prefix]/usr/lib/<brand>-ds/slapd-[serverID] ; ./restart-slapd
>+   Command Line: cd [prefix]/usr/lib/<PACKAGE_NAME>/slapd-[serverID] ; ./restart-slapd
>Index: ldapserver/ldap/servers/slapd/test-plugins/sampletask.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/sampletask.c,v
>retrieving revision 1.1
>diff -u -8 -r1.1 sampletask.c
>--- ldapserver/ldap/servers/slapd/test-plugins/sampletask.c	15 Dec 2006 00:22:54 -0000	1.1
>+++ ldapserver/ldap/servers/slapd/test-plugins/sampletask.c	9 Aug 2007 18:12:46 -0000
>@@ -34,25 +34,25 @@
>  * All rights reserved.
>  * END COPYRIGHT BLOCK **/
> 
> /* 
>  * sample task plugin
>  * 
>  * [How to set up the plugin for testing]
>  * 1. compile and package with the other plugins
>- * 2. put the plugin libsampletask-plugin.so at <prefix>/usr/lib/<brand>-ds/plugins
>+ * 2. put the plugin libsampletask-plugin.so at <prefix>/usr/lib/<PACKAGE_NAME>/plugins
>  * 3. register it as a plugin in dse.ldif
>  * Plugin entry:
>  * dn: cn=sampletask,cn=plugins,cn=config
>  * objectClass: top
>  * objectClass: nsSlapdPlugin
>  * objectClass: extensibleObject
>  * cn: sampletask
>- * nsslapd-pluginPath: <prefix>/usr/lib/<brand>-ds/plugins/libsampletask-plugin.so
>+ * nsslapd-pluginPath: <prefix>/usr/lib/<PACKAGE_NAME>/plugins/libsampletask-plugin.so
>  * nsslapd-pluginInitfunc: sampletask_init
>  * nsslapd-pluginType: object
>  * nsslapd-pluginEnabled: on
>  * nsslapd-pluginId: sampletask
>  * nsslapd-pluginVersion: <plugin_version>
>  * nsslapd-pluginVendor: <vendor name>
>  * nsslapd-pluginDescription: Sample task plugin
>  *
>Index: ldapserver/ldap/servers/slapd/tools/dbscan.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v
>retrieving revision 1.15
>diff -u -8 -r1.15 dbscan.c
>--- ldapserver/ldap/servers/slapd/tools/dbscan.c	10 Nov 2006 23:45:51 -0000	1.15
>+++ ldapserver/ldap/servers/slapd/tools/dbscan.c	9 Aug 2007 18:12:46 -0000
>@@ -745,17 +745,17 @@
>     printf("    -l <size>       max length of dumped id list\n");
>     printf("                    (default %d; 40 bytes <= size <= 1048576 bytes)\n",
>            MAX_BUFFER);
>     printf("    -G <n>          only display index entries with more than <n> ids\n");
>     printf("    -n              display idl lengths\n");
>     printf("    -r              display the conents of idl\n");
>     printf("    -s              Summary of index counts\n");
>     printf("  sample usages:\n");
>-    printf("    # set <prefix>/usr/lib/<brand-ds>:<prefix>/usr/lib:/usr/lib in the library path\n");
>+    printf("    # set <prefix>/usr/lib/<PACKAGE_NAME>:<prefix>/usr/lib:/usr/lib in the library path\n");
>     printf("    # dump the entry file\n");
>     printf("    %s -f id2entry.db\n", argv0);
>     printf("    # display index keys in cn.db4\n");
>     printf("    %s -f cn.db4\n", argv0);
>     printf("    # display index keys and the count of entries having the key in mail.db4\n");
>     printf("    %s -r -f mail.db4\n", argv0);
>     printf("    # display index keys and the IDs having more than 20 IDs in sn.db4\n");
>     printf("    %s -r -G 20 -f sn.db4\n", argv0);
>Index: ldapserver/wrappers/initscript.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
>retrieving revision 1.5
>diff -u -8 -r1.5 initscript.in
>--- ldapserver/wrappers/initscript.in	16 Mar 2007 23:06:58 -0000	1.5
>+++ ldapserver/wrappers/initscript.in	9 Aug 2007 18:12:46 -0000
>@@ -1,14 +1,14 @@
> #!/bin/sh
> #
> # @package_name@    This starts and stops @package_name@
> #
> # chkconfig:   - 21 79
>-# description: @package_name@ Directory Server
>+# description: @capbrand@ Directory Server
> # processname: @sbindir@/ns-slapd
> # configdir:   @sysconfdir@/@package_name@/
> # piddir:      @localstatedir@/run/@package_name@
> # datadir:     @localstatedir@/lib/@package_name@/slapd-<instance name>
> #
> 
> # Source function library.
> if [ -f /etc/rc.d/init.d/functions ] ; then

Actions: View | Diff

Attachments on bug 251549: 160996 | 160997 | 161180 | 161183 | 161184