Attachment 159551 Details for Bug 248145 – diffs to remove files

[patch] diffs to remove files

cvsdiffs (text/plain), 8.12 KB, created by Rich Megginson on 2007-07-18 19:43:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-07-18 19:43:41 UTC

Size: 8.12 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.49
>diff -u -8 -r1.49 Makefile.am
>--- ldapserver/Makefile.am	13 Jul 2007 18:35:32 -0000	1.49
>+++ ldapserver/Makefile.am	18 Jul 2007 19:36:34 -0000
>@@ -85,20 +85,20 @@
> defaultuser=@defaultuser@
> defaultgroup=@defaultgroup@
> 
> #------------------------
> # Build Products
> #------------------------
> sbin_PROGRAMS = ns-slapd
> 
>-bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
>+bin_PROGRAMS = dbscan-bin dsktune-bin infadd-bin ldap-agent-bin \
> 	ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
> 
>-server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
>+server_LTLIBRARIES = libslapd.la libns-dshttpd.la
> 
> # this is how to add optional plugins
> if enable_pam_passthru
> LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
> enable_pam_passthru = 1
> endif
> if enable_dna
> LIBDNA_PLUGIN = libdna-plugin.la
>@@ -173,27 +173,24 @@
> 	$(srcdir)/ldap/schema/50ns-admin.ldif \
> 	$(srcdir)/ldap/schema/50ns-certificate.ldif \
> 	$(srcdir)/ldap/schema/50ns-directory.ldif \
> 	$(srcdir)/ldap/schema/50ns-value.ldif \
> 	$(srcdir)/ldap/schema/50ns-web.ldif \
> 	$(srcdir)/ldap/schema/60pam-plugin.ldif \
> 	$(srcdir)/ldap/schema/99user.ldif
> 
>-bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
>+bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
> 	wrappers/dbscan \
>-	wrappers/ds_newinst \
>-	ldap/admin/src/ds_newinst.pl \
> 	wrappers/dsktune \
> 	wrappers/infadd \
> 	wrappers/ldap-agent \
> 	wrappers/ldclt \
> 	wrappers/ldif \
> 	$(srcdir)/ldap/admin/src/logconv.pl \
>-	ldap/admin/src/migrateTo11 \
> 	wrappers/migratecred \
> 	wrappers/mmldif \
> 	wrappers/pwdhash \
> 	wrappers/rsearch \
> 	wrappers/cl-dump \
> 	ldap/admin/src/scripts/cl-dump.pl \
> 	wrappers/repl-monitor \
> 	ldap/admin/src/scripts/repl-monitor.pl \
>@@ -236,21 +233,17 @@
> 	ldap/admin/src/scripts/template-db2bak.pl \
> 	ldap/admin/src/scripts/template-db2index.pl \
> 	ldap/admin/src/scripts/template-db2ldif.pl \
> 	ldap/admin/src/scripts/template-ldif2db.pl \
> 	ldap/admin/src/scripts/template-ns-accountstatus.pl \
> 	ldap/admin/src/scripts/template-ns-activate.pl \
> 	ldap/admin/src/scripts/template-ns-inactivate.pl \
> 	ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
>-	ldap/admin/src/scripts/template-verify-db.pl \
>-	$(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \
>-	$(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \
>-	$(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
>-	$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
>+	ldap/admin/src/scripts/template-verify-db.pl
> 
> init_SCRIPTS = wrappers/$(PACKAGE_NAME)
> 
> inf_DATA = ldap/admin/src/slapd.inf \
> 	ldap/admin/src/scripts/dscreate.map \
> 	ldap/admin/src/scripts/dsorgentries.map
> 
> #////////////////////////////////////////////////////////////////
>@@ -300,36 +293,16 @@
> 
> #////////////////////////////////////////////////////////////////
> #
> #   Dynamic Server Libraries
> #
> #////////////////////////////////////////////////////////////////
> 
> #------------------------
>-# libds_admin
>-#------------------------
>-libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \
>-	ldap/admin/lib/dsalib_confs.c \
>-	ldap/admin/lib/dsalib_db.c \
>-	ldap/admin/lib/dsalib_debug.c \
>-	ldap/admin/lib/dsalib_dn.c \
>-	ldap/admin/lib/dsalib_filename.c \
>-	ldap/admin/lib/dsalib_html.c \
>-	ldap/admin/lib/dsalib_ldif.c \
>-	ldap/admin/lib/dsalib_location.c \
>-	ldap/admin/lib/dsalib_pw.c \
>-	ldap/admin/lib/dsalib_tailf.c \
>-	ldap/admin/lib/dsalib_updown.c \
>-	ldap/admin/lib/dsalib_util.c
>-
>-libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
>-
>-#------------------------
> # libns-dshttpd
> #------------------------
> libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
> 	lib/libaccess/acl.tab.cpp \
> 	lib/libaccess/acl.yy.cpp \
> 	lib/libaccess/aclcache.cpp \
> 	lib/libaccess/aclerror.cpp \
> 	lib/libaccess/acleval.cpp \
>@@ -860,27 +833,16 @@
> # dbscan
> #------------------------
> dbscan_bin_SOURCES = ldap/servers/slapd/tools/dbscan.c
> 
> dbscan_bin_CPPFLAGS = @db_inc@ $(AM_CPPFLAGS)
> dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK)
> 
> #------------------------
>-# ds_newinst
>-#------------------------
>-ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
>-	ldap/admin/src/create_instance.c \
>-	ldap/admin/src/ds_newinst.c \
>-	ldap/admin/src/script-gen.c
>-
>-ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>-
>-#------------------------
> # dsktune
> #------------------------
> dsktune_bin_SOURCES = ldap/systools/idsktune.c \
> 	ldap/systools/pio.c
> 
> #------------------------
> # infadd
> #------------------------
>Index: ldapserver/ldap/admin/src/scripts/Setup.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
>retrieving revision 1.8
>diff -u -8 -r1.8 Setup.pm.in
>--- ldapserver/ldap/admin/src/scripts/Setup.pm.in	29 Jun 2007 21:12:21 -0000	1.8
>+++ ldapserver/ldap/admin/src/scripts/Setup.pm.in	18 Jul 2007 19:36:34 -0000
>@@ -210,18 +210,27 @@
>     if ($level) {
>         $self->log($level, $string);
>     }
>     print $string;
> }
> 
> sub doExit {
>     my $self = shift;
>-    $self->msg($FATAL, 'setup_exiting', $self->{log}->{filename});
>-	exit 1;
>+    my $code = shift;
>+    if (!defined($code)) {
>+        $code = 1;
>+    }
>+
>+    if ($code) {
>+        $self->msg($FATAL, 'setup_exiting', $self->{log}->{filename});
>+    } else {
>+        $self->msg($SUCCESS, 'setup_exiting', $self->{log}->{filename});
>+    }
>+	exit $code;
> }
> 
> # get a list of the directory servers in configdir
> sub getDirServers {
>     my $self = shift;
>     if (!$self->{dirservers}) {
>         $self->{dirservers} = [];
>         for my $dir (glob("$self->{configdir}/slapd-*")) {
>@@ -233,8 +242,15 @@
>     return @{$self->{dirservers}};
> }
> 
> 
> #############################################################################
> # Mandatory TRUE return value.
> #
> 1;
>+
>+# emacs settings
>+# Local Variables:
>+# mode:perl
>+# indent-tabs-mode: nil
>+# tab-width: 4
>+# End:
>Index: ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v
>retrieving revision 1.2
>diff -u -8 -r1.2 migrate-ds.pl.in
>--- ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in	13 Jul 2007 18:35:32 -0000	1.2
>+++ ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in	18 Jul 2007 19:36:34 -0000
>@@ -57,21 +57,20 @@
> 
> my $res = new Resource("@propertydir@/migrate-ds.res",
>                        "@propertydir@/setup-ds.res");
> 
> my $mig = new Migration($res);
> 
> $mig->msg('begin_ds_migration', $mig->{oldsroot});
> if (!migrateDS($mig)) {
>-    exit 1;
>+    $mig->doExit(1);
> }
> $mig->msg('end_ds_migration');
>+$mig->doExit(0);
> 
> END {
>     if ($mig) {
>         if (!$mig->{keep}) {
>             unlink $mig->{inffile};
>         }
>-
>-        $mig->doExit();
>     }
> }
>Index: ldapserver/ldap/admin/src/scripts/setup-ds.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
>retrieving revision 1.6
>diff -u -8 -r1.6 setup-ds.pl.in
>--- ldapserver/ldap/admin/src/scripts/setup-ds.pl.in	13 Jul 2007 18:35:32 -0000	1.6
>+++ ldapserver/ldap/admin/src/scripts/setup-ds.pl.in	18 Jul 2007 19:36:34 -0000
>@@ -71,22 +71,23 @@
>     $setup->{inf}->write();
> }
> 
> my @errs = createDSInstance($setup->{inf});
> if (@errs) {
>     $setup->msg(@errs);
>     $setup->msg($FATAL, 'error_creating_dsinstance',
>                 $setup->{inf}->{slapd}->{ServerIdentifier});
>+    $setup->doExit(1);
> } else {
>     $setup->msg('created_dsinstance',
>                 $setup->{inf}->{slapd}->{ServerIdentifier});
> }
> 
>+$setup->doExit(0);
>+
> END {
>     if ($setup) {
>         if (!$setup->{keep}) {
>             unlink $setup->{inffile};
>         }
>-
>-        $setup->doExit();
>     }
> }

Actions: View | Diff

Attachments on bug 248145: 159175 | 159176 | 159177 | 159178 | 159179 | 159181 | 159182 | 159183 | 159184 | 159185 | 159186 | 159187 | 159188 | 159227 | 159228 | 159230 | 159234 | 159235 | 159550 | 159551 | 159552 | 159558