[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'ubuntu'
Timo Aaltonen
tjaalton-guest at alioth.debian.org
Wed Feb 6 11:31:39 UTC 2013
.gitignore | 4
389-doap.rdf | 47
Makefile.am | 32
VERSION.sh | 9
configure.ac | 20
debian/389-ds-base.config | 5
debian/389-ds-base.dirsrv.init | 7
debian/389-ds-base.lintian-overrides | 1
debian/389-ds-base.prerm | 1
debian/389-ds-base.templates | 5
debian/README.Debian | 5
debian/changelog | 73
debian/control | 93
debian/copyright | 3
debian/patches/default_user | 8
debian/po/POTFILES.in | 1
debian/po/templates.pot | 32
debian/rules | 4
debian/watch | 1
ldap/admin/src/logconv.pl | 263 +
ldap/admin/src/scripts/20betxn.pl | 72
ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif | 15
ldap/admin/src/scripts/DSCreate.pm.in | 19
ldap/admin/src/scripts/ds-logpipe.py | 2
ldap/admin/src/scripts/template-bak2db.in | 13
ldap/admin/src/scripts/template-cleanallruv.pl.in | 186
ldap/admin/src/scripts/template-db2bak.in | 14
ldap/admin/src/scripts/template-db2index.in | 2
ldap/admin/src/scripts/template-db2index.pl.in | 89
ldap/admin/src/scripts/template-db2ldif.in | 2
ldap/admin/src/scripts/template-ldif2db.in | 35
ldap/ldif/50posix-winsync-plugin.ldif | 21
ldap/ldif/50replication-plugins.ldif | 1
ldap/ldif/template-dse.ldif.in | 21
ldap/ldif/template-pampta.ldif.in | 2
ldap/schema/01core389.ldif | 50
ldap/schema/02common.ldif | 8
ldap/schema/60posix-winsync-plugin.ldif | 44
ldap/servers/plugins/acl/acl.c | 84
ldap/servers/plugins/acl/acl.h | 5
ldap/servers/plugins/acl/acleffectiverights.c | 10
ldap/servers/plugins/acl/aclgroup.c | 2
ldap/servers/plugins/acl/acllas.c | 70
ldap/servers/plugins/acl/acllist.c | 48
ldap/servers/plugins/acl/aclparse.c | 74
ldap/servers/plugins/automember/automember.c | 63
ldap/servers/plugins/chainingdb/cb_instance.c | 192 -
ldap/servers/plugins/cos/cos.c | 110
ldap/servers/plugins/cos/cos_cache.c | 75
ldap/servers/plugins/cos/cos_cache.h | 1
ldap/servers/plugins/deref/deref.c | 5
ldap/servers/plugins/dna/dna.c | 95
ldap/servers/plugins/linkedattrs/fixup_task.c | 2
ldap/servers/plugins/linkedattrs/linked_attrs.h | 2
ldap/servers/plugins/memberof/memberof.c | 433 +-
ldap/servers/plugins/memberof/memberof.h | 2
ldap/servers/plugins/pam_passthru/pam_passthru.h | 1
ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 190 -
ldap/servers/plugins/posix-winsync/README | 50
ldap/servers/plugins/posix-winsync/posix-group-func.c | 1018 +++++
ldap/servers/plugins/posix-winsync/posix-group-func.h | 23
ldap/servers/plugins/posix-winsync/posix-group-task.c | 438 ++
ldap/servers/plugins/posix-winsync/posix-winsync-config.c | 302 +
ldap/servers/plugins/posix-winsync/posix-winsync.c | 1803 +++++++++
ldap/servers/plugins/posix-winsync/posix-wsp-ident.h | 53
ldap/servers/plugins/referint/referint.c | 992 ++---
ldap/servers/plugins/replication/cl5_api.c | 93
ldap/servers/plugins/replication/cl5_api.h | 9
ldap/servers/plugins/replication/cl5_clcache.c | 16
ldap/servers/plugins/replication/repl.h | 14
ldap/servers/plugins/replication/repl5.h | 81
ldap/servers/plugins/replication/repl5_agmt.c | 124
ldap/servers/plugins/replication/repl5_agmtlist.c | 18
ldap/servers/plugins/replication/repl5_connection.c | 19
ldap/servers/plugins/replication/repl5_inc_protocol.c | 23
ldap/servers/plugins/replication/repl5_init.c | 291 +
ldap/servers/plugins/replication/repl5_plugins.c | 190 -
ldap/servers/plugins/replication/repl5_replica.c | 452 +-
ldap/servers/plugins/replication/repl5_replica_config.c | 2632 ++++++++++----
ldap/servers/plugins/replication/repl5_ruv.c | 87
ldap/servers/plugins/replication/repl5_ruv.h | 2
ldap/servers/plugins/replication/repl5_tot_protocol.c | 2
ldap/servers/plugins/replication/repl_bind.c | 1
ldap/servers/plugins/replication/repl_connext.c | 156
ldap/servers/plugins/replication/repl_extop.c | 724 ++-
ldap/servers/plugins/replication/repl_globals.c | 6
ldap/servers/plugins/replication/replutil.c | 47
ldap/servers/plugins/replication/urp.c | 121
ldap/servers/plugins/replication/urp.h | 2
ldap/servers/plugins/replication/windows_connection.c | 2
ldap/servers/plugins/replication/windows_inc_protocol.c | 30
ldap/servers/plugins/replication/windows_private.c | 1453 ++++++-
ldap/servers/plugins/replication/windows_protocol_util.c | 385 +-
ldap/servers/plugins/replication/windows_tot_protocol.c | 7
ldap/servers/plugins/replication/windowsrepl.h | 11
ldap/servers/plugins/replication/winsync-plugin.h | 653 ---
ldap/servers/plugins/roles/roles_cache.c | 4
ldap/servers/plugins/roles/roles_plugin.c | 6
ldap/servers/plugins/rootdn_access/rootdn_access.c | 83
ldap/servers/plugins/schema_reload/schema_reload.c | 11
ldap/servers/plugins/syntaxes/nameoptuid.c | 3
ldap/servers/plugins/syntaxes/string.c | 63
ldap/servers/plugins/uiduniq/plugin-utils.h | 4
ldap/servers/plugins/uiduniq/uid.c | 84
ldap/servers/plugins/uiduniq/utils.c | 6
ldap/servers/plugins/usn/usn_cleanup.c | 2
ldap/servers/slapd/abandon.c | 10
ldap/servers/slapd/add.c | 177
ldap/servers/slapd/apibroker.c | 58
ldap/servers/slapd/attr.c | 77
ldap/servers/slapd/attrlist.c | 6
ldap/servers/slapd/attrsyntax.c | 140
ldap/servers/slapd/back-ldbm/back-ldbm.h | 9
ldap/servers/slapd/back-ldbm/cache.c | 42
ldap/servers/slapd/back-ldbm/dblayer.c | 191 -
ldap/servers/slapd/back-ldbm/id2entry.c | 6
ldap/servers/slapd/back-ldbm/idl.c | 19
ldap/servers/slapd/back-ldbm/idl_new.c | 45
ldap/servers/slapd/back-ldbm/import-merge.c | 4
ldap/servers/slapd/back-ldbm/index.c | 43
ldap/servers/slapd/back-ldbm/instance.c | 4
ldap/servers/slapd/back-ldbm/ldbm_add.c | 938 ++--
ldap/servers/slapd/back-ldbm/ldbm_bind.c | 33
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 18
ldap/servers/slapd/back-ldbm/ldbm_config.c | 23
ldap/servers/slapd/back-ldbm/ldbm_config.h | 1
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 690 +--
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 18
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 8
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 3
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 275 -
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 1142 +++---
ldap/servers/slapd/back-ldbm/ldbm_search.c | 48
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 53
ldap/servers/slapd/back-ldbm/misc.c | 12
ldap/servers/slapd/back-ldbm/monitor.c | 28
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 24
ldap/servers/slapd/back-ldbm/start.c | 45
ldap/servers/slapd/back-ldbm/vlv.c | 10
ldap/servers/slapd/backend.c | 125
ldap/servers/slapd/backend_manager.c | 41
ldap/servers/slapd/config.c | 32
ldap/servers/slapd/configdse.c | 40
ldap/servers/slapd/connection.c | 103
ldap/servers/slapd/conntable.c | 3
ldap/servers/slapd/daemon.c | 33
ldap/servers/slapd/dn.c | 373 +
ldap/servers/slapd/dse.c | 109
ldap/servers/slapd/entry.c | 310 +
ldap/servers/slapd/entrywsi.c | 53
ldap/servers/slapd/errormap.c | 10
ldap/servers/slapd/filter.c | 90
ldap/servers/slapd/ldaputil.c | 305 -
ldap/servers/slapd/libglobs.c | 1151 ++++--
ldap/servers/slapd/libslapd.def | 4
ldap/servers/slapd/log.c | 92
ldap/servers/slapd/main.c | 100
ldap/servers/slapd/mapping_tree.c | 26
ldap/servers/slapd/modify.c | 171
ldap/servers/slapd/opshared.c | 67
ldap/servers/slapd/pagedresults.c | 167
ldap/servers/slapd/passwd_extop.c | 1
ldap/servers/slapd/pblock.c | 20
ldap/servers/slapd/plugin.c | 2
ldap/servers/slapd/plugin_acl.c | 30
ldap/servers/slapd/proto-slap.h | 25
ldap/servers/slapd/pw.c | 293 +
ldap/servers/slapd/pw_mgmt.c | 13
ldap/servers/slapd/pw_retry.c | 5
ldap/servers/slapd/result.c | 1
ldap/servers/slapd/saslbind.c | 2
ldap/servers/slapd/schema.c | 30
ldap/servers/slapd/slap.h | 123
ldap/servers/slapd/slapi-plugin.h | 268 +
ldap/servers/slapd/slapi-private.h | 23
ldap/servers/slapd/ssl.c | 5
ldap/servers/slapd/task.c | 56
ldap/servers/slapd/utf8compare.c | 19
ldap/servers/slapd/util.c | 310 +
ldap/servers/slapd/value.c | 11
ldap/servers/slapd/valueset.c | 36
lib/libaccess/lasdns.cpp | 283 -
lib/libaccess/lasip.cpp | 397 +-
lib/libaccess/lasip.h | 3
man/man1/ds-logpipe.py.1 | 2
wrappers/initscript.in | 3
186 files changed, 18163 insertions(+), 6673 deletions(-)
New commits:
commit 02ddd6aa692bd1e71eeab40b5bfcca1283a64528
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed Mar 6 13:25:21 2013 +0200
release to raring
diff --git a/debian/changelog b/debian/changelog
index ed5e300..dbce75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+389-ds-base (1.3.0.2-0ubuntu1) raring; urgency=low
+
+ * Sync from unreleased debian git.
+ - new upstream release
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com> Wed, 06 Mar 2013 13:24:24 +0200
+
389-ds-base (1.3.0.2-1) UNRELEASED; urgency=low
* New upstream release.
commit dade08dae50f8ba86ec2359d97ebe1e58ca982e5
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed Mar 6 13:19:14 2013 +0200
control: Bump the policy to 3.9.4, no changes.
diff --git a/debian/changelog b/debian/changelog
index 9a222cd..baba417 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
389-ds-base (1.3.0.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * control: Bump the policy to 3.9.4, no changes.
-- Timo Aaltonen <tjaalton at ubuntu.com> Tue, 11 Dec 2012 14:34:01 +0200
diff --git a/debian/control b/debian/control
index 8cbb39f..9170590 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 9),
libperl-dev,
libkrb5-dev,
libpcre3-dev,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-fedora-ds/389-ds-base.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-fedora-ds/389-ds-base.git
Homepage: http://directory.fedoraproject.org
commit 6765aa019a8f5022105c02a500c602dc8085fb8c
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed Mar 6 12:47:06 2013 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 1e25ff1..9a222cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-389-ds-base (1.3.0~rc2-1) UNRELEASED; urgency=low
+389-ds-base (1.3.0.2-1) UNRELEASED; urgency=low
* New upstream release.
commit 606cb848e358b6ca86b6263f5aa77a6be342d509
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Wed Jan 16 17:35:51 2013 -0800
bump version to 1.3.0.2
(1.3.0.1 is void.)
diff --git a/VERSION.sh b/VERSION.sh
index 9139830..852013d 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=3
-VERSION_MAINT=0.0
+VERSION_MAINT=0.2
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit 57f4381395e2181e5610acc715e8c71592616ffd
Author: Nathan Kinder <nkinder at redhat.com>
Date: Wed Jan 16 14:20:14 2013 -0800
Ticket 556 - Don't overwrite certmap.conf during upgrade
The certmap.conf config files were being overwritten with the
default template during upgrade. We need to skip writing the
certmap.conf files if they already exist so config changes are
not lost.
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
index 1d5e71a..0acd74f 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -482,12 +482,16 @@ sub makeOtherConfigFiles {
my $src = "$inf->{General}->{prefix}@configdir@/certmap.conf";
my $dest = "$inf->{slapd}->{config_dir}/certmap.conf";
$! = 0; # clear errno
- copy($src, $dest);
- if ($!) {
- return ('error_copying_file', $src, $dest, $!);
- }
- if (@errs = changeOwnerMode($inf, 4, $dest)) {
- return @errs;
+
+ #in skip mode, skip files that already exist
+ unless ($skip and -f $dest) {
+ copy($src, $dest);
+ if ($!) {
+ return ('error_copying_file', $src, $dest, $!);
+ }
+ if (@errs = changeOwnerMode($inf, 4, $dest)) {
+ return @errs;
+ }
}
$src = "$inf->{General}->{prefix}@configdir@/slapd-collations.conf";
commit 5941a5bf4e7c9970c7e32ddf9d83eb7645b9b710
Author: Noriko Hosoi <nhosoi at totoro.usersys.redhat.com>
Date: Wed Jan 9 13:14:17 2013 -0800
Ticket #542 - Cannot dynamically set nsslapd-maxbersize
Fix description: Based on the proposal made by rmeggins at redhat.com
in the ticket #542, this patch sets maxbersize every time before
reading the client input from the socket.
If the incoming ber size is larger than maxbersize, access log logs:
[..] conn=# op=-1 fd=64 closed error 34 (Numerical result out of range) - B2
And the error log logs:
[..] connection - conn=# fd=# Incoming BER Element was too long, max
allowable is # bytes. Change the nsslapd-maxbersize attribute in
cn=config to increase.
https://fedorahosted.org/389/ticket/542
Reviewed by Rich (Thank you!!)
(cherry picked from commit cce46be3b8cc12ccef8c34024a6ade2c07e28273)
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index d598b0b..7750bfe 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -1794,10 +1794,12 @@ get_next_from_buffer( void *buffer, size_t buffer_size, ber_len_t *lenp,
}
else if (errno == ERANGE)
{
+ ber_len_t maxbersize = config_get_maxbersize();
/* openldap does not differentiate between length == 0
and length > max - all we know is that there was a
problem with the length - assume too big */
err = SLAPD_DISCONNECT_BER_TOO_BIG;
+ log_ber_too_big_error(conn, 0, maxbersize);
}
else
{
@@ -1998,8 +2000,7 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
disconnect_server( conn, conn->c_connid, -1, SLAPD_DISCONNECT_BAD_BER_TAG, EPROTO );
return CONN_DONE;
}
- if(is_ber_too_big(conn,len))
- {
+ if(is_ber_too_big(conn,len)) {
disconnect_server( conn, conn->c_connid, -1, SLAPD_DISCONNECT_BER_TOO_BIG, 0 );
return CONN_DONE;
}
@@ -2706,7 +2707,7 @@ connection_set_ssl_ssf(Connection *conn)
static int
is_ber_too_big(const Connection *conn, ber_len_t ber_len)
{
- ber_len_t maxbersize= config_get_maxbersize();
+ ber_len_t maxbersize = config_get_maxbersize();
if(ber_len > maxbersize)
{
log_ber_too_big_error(conn, ber_len, maxbersize);
@@ -2726,7 +2727,7 @@ log_ber_too_big_error(const Connection *conn, ber_len_t ber_len,
ber_len_t maxbersize)
{
if (0 == maxbersize) {
- maxbersize= config_get_maxbersize();
+ maxbersize = config_get_maxbersize();
}
if (0 == ber_len) {
slapi_log_error( SLAPI_LOG_FATAL, "connection",
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index df4f2f8..b61e5d4 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -49,7 +49,7 @@ connection_table_new(int table_size)
{
Connection_Table *ct;
int i = 0;
-
+ ber_len_t maxbersize = config_get_maxbersize();
ct= (Connection_Table*)slapi_ch_calloc( 1, sizeof(Connection_Table) );
ct->size= table_size;
@@ -63,7 +63,6 @@ connection_table_new(int table_size)
for ( i = 0; i < table_size; i++ )
{
LBER_SOCKET invalid_socket;
- ber_len_t maxbersize = config_get_maxbersize();
/* DBDB---move this out of here once everything works */
ct->c[i].c_sb = ber_sockbuf_alloc();
invalid_socket = SLAPD_INVALID_SOCKET;
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 85052fe..e3d2009 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -2590,6 +2590,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
/* struct sockaddr_in from;*/
PRNetAddr from;
PRFileDesc *pr_clonefd = NULL;
+ ber_len_t maxbersize;
memset(&from, 0, sizeof(from)); /* reset to nulls so we can see what was set */
if ( (ns = accept_and_configure( tcps, pr_acceptfd, &from,
@@ -2646,14 +2647,16 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
func_pointers.lbextiofn_write = write_function;
func_pointers.lbextiofn_writev = NULL;
#ifdef _WIN32
- func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) ns;
+ func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) ns;
#else
- func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) pr_clonefd;
+ func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) pr_clonefd;
#endif
- ber_sockbuf_set_option( conn->c_sb,
- LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
+ ber_sockbuf_set_option(conn->c_sb,
+ LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
}
#endif /* !USE_OPENLDAP */
+ maxbersize = config_get_maxbersize();
+ ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &maxbersize );
if( secure && config_get_SSLclientAuth() != SLAPD_SSLCLIENTAUTH_OFF ) {
/* Prepare to handle the client's certificate (if any): */
commit 21cade3fed05560a16a401606460b982e5bba70e
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Tue Jan 8 16:18:01 2013 -0800
bump version to 1.3.0.0
diff --git a/VERSION.sh b/VERSION.sh
index f7dded2..9139830 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,11 +10,11 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=3
-VERSION_MAINT=0
+VERSION_MAINT=0.0
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.rc3
+#VERSION_PREREL=.rc3
# NOTES on VERSION_PREREL
# use aN for an alpha release e.g. a1, a2, etc.
# use rcN for a release candidate e.g. rc1, rc2, etc.
commit 302cea43201c09dad0235dca6c734836637c13e2
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Tue Jan 8 11:39:00 2013 -0800
bump version to 1.3.0.rc3
diff --git a/VERSION.sh b/VERSION.sh
index 0adec16..f7dded2 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -14,7 +14,7 @@ VERSION_MAINT=0
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.rc2
+VERSION_PREREL=.rc3
# NOTES on VERSION_PREREL
# use aN for an alpha release e.g. a1, a2, etc.
# use rcN for a release candidate e.g. rc1, rc2, etc.
commit 090236b6dd97b16258f3bb03631dabfadef34a99
Author: Nathan Kinder <nkinder at redhat.com>
Date: Fri Jan 4 11:41:48 2013 -0800
Ticket 549 - DNA plugin no longer reports additional info when range is depleted
When the DNA plug-in was modified to allocate range values at the
bepreop phase, it stopped returning detailed error strings to the
client when the range was depleted.
This patch allows our bepreop functions to fill in the error string
that the caller can return to the client.
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index 66d4a05..36dd936 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -2759,7 +2759,7 @@ dna_create_valcheck_filter(struct configEntry *config_entry, PRUint64 value, cha
/* This function is called at BEPREOP timing to add uid/gidNumber
* if modtype is missing */
static int
-_dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
+_dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e, char **errstr)
{
int ret = 0;
PRCList *list = NULL;
@@ -2886,6 +2886,10 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
if (LDAP_SUCCESS != ret) {
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_pre_op: no more values available!!\n");
+ /* Set an error string to be returned to the client. */
+ *errstr = slapi_ch_smprintf("Allocation of a new value for range"
+ " %s failed! Unable to proceed.",
+ config_entry->dn);
slapi_unlock_mutex(config_entry->lock);
break;
}
@@ -2895,6 +2899,10 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
if (LDAP_SUCCESS != ret){
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_pre_op: failed to allocate a new ID\n");
+ /* Set an error string to be returned to the client. */
+ *errstr = slapi_ch_smprintf("Allocation of a new value for range"
+ " %s failed! Unable to proceed.",
+ config_entry->dn);
slapi_unlock_mutex(config_entry->lock);
break;
}
@@ -2902,6 +2910,10 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
/* dna_first_free_value() failed for some unknown reason */
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_pre_op: failed to allocate a new ID!!\n");
+ /* Set an error string to be returned to the client. */
+ *errstr = slapi_ch_smprintf("Allocation of a new value for range"
+ " %s failed! Unable to proceed.",
+ config_entry->dn);
slapi_unlock_mutex(config_entry->lock);
break;
}
@@ -2943,7 +2955,7 @@ bail:
/* This function is called at BEPREOP timing to add uid/gidNumber
* if modtype is missing */
static int
-_dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
+_dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods, char **errstr)
{
int ret = 0;
PRCList *list = NULL;
@@ -3144,6 +3156,10 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
if (LDAP_SUCCESS != ret) {
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_pre_op: no more values available!!\n");
+ /* Set an error string to be returned to the client. */
+ *errstr = slapi_ch_smprintf("Allocation of a new value for range"
+ " %s failed! Unable to proceed.",
+ config_entry->dn);
slapi_unlock_mutex(config_entry->lock);
break;
}
@@ -3153,6 +3169,10 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
if (LDAP_SUCCESS != ret){
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_pre_op: failed to allocate a new ID\n");
+ /* Set an error string to be returned to the client. */
+ *errstr = slapi_ch_smprintf("Allocation of a new value for range"
+ " %s failed! Unable to proceed.",
+ config_entry->dn);
slapi_unlock_mutex(config_entry->lock);
break;
}
@@ -3160,6 +3180,10 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
/* dna_first_free_value() failed for some unknown reason */
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_pre_op: failed to allocate a new ID!!\n");
+ /* Set an error string to be returned to the client. */
+ *errstr = slapi_ch_smprintf("Allocation of a new value for range"
+ " %s failed! Unable to proceed.",
+ config_entry->dn);
slapi_unlock_mutex(config_entry->lock);
break;
}
@@ -3287,9 +3311,9 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
}
} else {
if (LDAP_CHANGETYPE_ADD == modtype) {
- ret = _dna_pre_op_add(pb, test_e);
+ ret = _dna_pre_op_add(pb, test_e, &errstr);
} else {
- if((ret = _dna_pre_op_modify(pb, test_e, smods))){
+ if((ret = _dna_pre_op_modify(pb, test_e, smods, &errstr))){
slapi_mods_free(&smods);
}
}
commit b3e16f033f41834d8469e59f1a1ba885b427a1e8
Author: Mark Reynolds <mreynolds at redhat.com>
Date: Tue Dec 18 16:04:01 2012 -0500
Ticket 541 - need to set plugin as off in ldif template
Reviewed by: richm(Thanks)
(cherry picked from commit 1f7195980fa7073f88ba04fce74b62b07e43e143)
diff --git a/ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif b/ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif
index e258274..21ceb0f 100644
--- a/ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif
+++ b/ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif
@@ -6,7 +6,7 @@ cn: RootDN Access Control
nsslapd-pluginpath: librootdn-access-plugin.so
nsslapd-plugininitfunc: rootdn_init
nsslapd-plugintype: internalpreoperation
-nsslapd-pluginenabled: on
+nsslapd-pluginenabled: off
nsslapd-plugin-depends-on-type: database
# these will be replaced when the server loads the plugin
nsslapd-pluginId: ID
commit b12e69e0fbd9cf14d3b4b74f8424c7658fa1a6f3
Author: Mark Reynolds <mreynolds at redhat.com>
Date: Tue Dec 18 14:41:52 2012 -0500
Ticket 541 - RootDN Access Control plugin is missing after upgrade
Created the upgrade ldif: 50rootdnaccesscontrolplugin.ldif
https://fedorahosted.org/389/ticket/541
Reviewed by: richm(Thanks)
(cherry picked from commit d0ee60fafdf62bdbbcde31281d25a58a75aaffa8)
diff --git a/Makefile.am b/Makefile.am
index d39bd9c..094d13c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -498,6 +498,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif \
ldap/admin/src/scripts/50refintprecedence.ldif \
ldap/admin/src/scripts/50retroclprecedence.ldif \
+ ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif \
ldap/admin/src/scripts/60upgradeschemafiles.pl \
ldap/admin/src/scripts/70upgradefromldif.pl \
ldap/admin/src/scripts/80upgradednformat.pl \
diff --git a/Makefile.in b/Makefile.in
index fe06bba..37e9486 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -21,23 +21,6 @@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -129,12 +112,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(serverdir)" \
"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
@@ -1094,11 +1071,6 @@ DIST_SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
$(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \
$(am__ns_slapd_SOURCES_DIST) $(pwdhash_bin_SOURCES) \
$(rsearch_bin_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
man1dir = $(mandir)/man1
man8dir = $(mandir)/man8
NROFF = nroff
@@ -1114,16 +1086,12 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
- || { sleep 5 && rm -rf "$(distdir)"; }; \
- else :; fi
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.bz2
distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -1148,7 +1116,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -1181,7 +1148,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NETSNMP_CONFIG = @NETSNMP_CONFIG@
NM = @NM@
@@ -1196,12 +1162,9 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -1213,7 +1176,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -1280,6 +1242,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mibdir = $(datadir)@mibdir@
mkdir_p = @mkdir_p@
@@ -1761,6 +1724,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif \
ldap/admin/src/scripts/50refintprecedence.ldif \
ldap/admin/src/scripts/50retroclprecedence.ldif \
+ ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif \
ldap/admin/src/scripts/60upgradeschemafiles.pl \
ldap/admin/src/scripts/70upgradefromldif.pl \
ldap/admin/src/scripts/80upgradednformat.pl \
@@ -2721,7 +2685,7 @@ all: $(BUILT_SOURCES) config.h
.SUFFIXES:
.SUFFIXES: .S .c .cpp .lo .o .obj
-am--refresh: Makefile
+am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -2757,8 +2721,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -2782,7 +2748,7 @@ ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp):
ldap/libraries/libavl/avl.$(OBJEXT): \
ldap/libraries/libavl/$(am__dirstamp) \
ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp)
-libavl.a: $(libavl_a_OBJECTS) $(libavl_a_DEPENDENCIES) $(EXTRA_libavl_a_DEPENDENCIES)
+libavl.a: $(libavl_a_OBJECTS) $(libavl_a_DEPENDENCIES)
-rm -f libavl.a
$(libavl_a_AR) libavl.a $(libavl_a_OBJECTS) $(libavl_a_LIBADD)
$(RANLIB) libavl.a
@@ -2816,12 +2782,13 @@ lib/ldaputil/libldaputil_a-ldapauth.$(OBJEXT): \
lib/ldaputil/libldaputil_a-vtable.$(OBJEXT): \
lib/ldaputil/$(am__dirstamp) \
lib/ldaputil/$(DEPDIR)/$(am__dirstamp)
-libldaputil.a: $(libldaputil_a_OBJECTS) $(libldaputil_a_DEPENDENCIES) $(EXTRA_libldaputil_a_DEPENDENCIES)
+libldaputil.a: $(libldaputil_a_OBJECTS) $(libldaputil_a_DEPENDENCIES)
-rm -f libldaputil.a
$(libldaputil_a_AR) libldaputil.a $(libldaputil_a_OBJECTS) $(libldaputil_a_LIBADD)
$(RANLIB) libldaputil.a
install-serverLTLIBRARIES: $(server_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
@list='$(server_LTLIBRARIES)'; test -n "$(serverdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -2829,8 +2796,6 @@ install-serverLTLIBRARIES: $(server_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(serverdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(serverdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(serverdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(serverdir)"; \
}
@@ -2854,6 +2819,7 @@ clean-serverLTLIBRARIES:
done
install-serverpluginLTLIBRARIES: $(serverplugin_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(serverplugindir)" || $(MKDIR_P) "$(DESTDIR)$(serverplugindir)"
@list='$(serverplugin_LTLIBRARIES)'; test -n "$(serverplugindir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -2861,8 +2827,6 @@ install-serverpluginLTLIBRARIES: $(serverplugin_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(serverplugindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(serverplugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(serverplugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(serverplugindir)"; \
}
@@ -2902,7 +2866,7 @@ ldap/servers/plugins/acctpolicy/libacctpolicy_plugin_la-acct_plugin.lo: \
ldap/servers/plugins/acctpolicy/libacctpolicy_plugin_la-acct_util.lo: \
ldap/servers/plugins/acctpolicy/$(am__dirstamp) \
ldap/servers/plugins/acctpolicy/$(DEPDIR)/$(am__dirstamp)
-libacctpolicy-plugin.la: $(libacctpolicy_plugin_la_OBJECTS) $(libacctpolicy_plugin_la_DEPENDENCIES) $(EXTRA_libacctpolicy_plugin_la_DEPENDENCIES)
+libacctpolicy-plugin.la: $(libacctpolicy_plugin_la_OBJECTS) $(libacctpolicy_plugin_la_DEPENDENCIES)
$(libacctpolicy_plugin_la_LINK) $(am_libacctpolicy_plugin_la_rpath) $(libacctpolicy_plugin_la_OBJECTS) $(libacctpolicy_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/acct_usability/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/acct_usability
@@ -2913,7 +2877,7 @@ ldap/servers/plugins/acct_usability/$(DEPDIR)/$(am__dirstamp):
ldap/servers/plugins/acct_usability/libacctusability_plugin_la-acct_usability.lo: \
ldap/servers/plugins/acct_usability/$(am__dirstamp) \
ldap/servers/plugins/acct_usability/$(DEPDIR)/$(am__dirstamp)
-libacctusability-plugin.la: $(libacctusability_plugin_la_OBJECTS) $(libacctusability_plugin_la_DEPENDENCIES) $(EXTRA_libacctusability_plugin_la_DEPENDENCIES)
+libacctusability-plugin.la: $(libacctusability_plugin_la_OBJECTS) $(libacctusability_plugin_la_DEPENDENCIES)
$(libacctusability_plugin_la_LINK) -rpath $(serverplugindir) $(libacctusability_plugin_la_OBJECTS) $(libacctusability_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/acl/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/acl
@@ -2954,7 +2918,7 @@ ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: \
ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: \
ldap/servers/plugins/acl/$(am__dirstamp) \
ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp)
-libacl-plugin.la: $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_DEPENDENCIES) $(EXTRA_libacl_plugin_la_DEPENDENCIES)
+libacl-plugin.la: $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_DEPENDENCIES)
$(libacl_plugin_la_LINK) -rpath $(serverplugindir) $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/uiduniq/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/uiduniq
@@ -2971,7 +2935,7 @@ ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo: \
ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-utils.lo: \
ldap/servers/plugins/uiduniq/$(am__dirstamp) \
ldap/servers/plugins/uiduniq/$(DEPDIR)/$(am__dirstamp)
-libattr-unique-plugin.la: $(libattr_unique_plugin_la_OBJECTS) $(libattr_unique_plugin_la_DEPENDENCIES) $(EXTRA_libattr_unique_plugin_la_DEPENDENCIES)
+libattr-unique-plugin.la: $(libattr_unique_plugin_la_OBJECTS) $(libattr_unique_plugin_la_DEPENDENCIES)
$(libattr_unique_plugin_la_LINK) -rpath $(serverplugindir) $(libattr_unique_plugin_la_OBJECTS) $(libattr_unique_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/automember/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/automember
@@ -2982,7 +2946,7 @@ ldap/servers/plugins/automember/$(DEPDIR)/$(am__dirstamp):
ldap/servers/plugins/automember/libautomember_plugin_la-automember.lo: \
ldap/servers/plugins/automember/$(am__dirstamp) \
ldap/servers/plugins/automember/$(DEPDIR)/$(am__dirstamp)
-libautomember-plugin.la: $(libautomember_plugin_la_OBJECTS) $(libautomember_plugin_la_DEPENDENCIES) $(EXTRA_libautomember_plugin_la_DEPENDENCIES)
+libautomember-plugin.la: $(libautomember_plugin_la_OBJECTS) $(libautomember_plugin_la_DEPENDENCIES)
$(libautomember_plugin_la_LINK) -rpath $(serverplugindir) $(libautomember_plugin_la_OBJECTS) $(libautomember_plugin_la_LIBADD) $(LIBS)
ldap/servers/slapd/back-ldbm/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/slapd/back-ldbm
@@ -3170,7 +3134,7 @@ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_key.lo: \
ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_srch.lo: \
ldap/servers/slapd/back-ldbm/$(am__dirstamp) \
ldap/servers/slapd/back-ldbm/$(DEPDIR)/$(am__dirstamp)
-libback-ldbm.la: $(libback_ldbm_la_OBJECTS) $(libback_ldbm_la_DEPENDENCIES) $(EXTRA_libback_ldbm_la_DEPENDENCIES)
+libback-ldbm.la: $(libback_ldbm_la_OBJECTS) $(libback_ldbm_la_DEPENDENCIES)
$(libback_ldbm_la_LINK) -rpath $(serverplugindir) $(libback_ldbm_la_OBJECTS) $(libback_ldbm_la_LIBADD) $(LIBS)
ldap/servers/plugins/bitwise/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/bitwise
@@ -3181,7 +3145,7 @@ ldap/servers/plugins/bitwise/$(DEPDIR)/$(am__dirstamp):
ldap/servers/plugins/bitwise/libbitwise_plugin_la-bitwise.lo: \
ldap/servers/plugins/bitwise/$(am__dirstamp) \
ldap/servers/plugins/bitwise/$(DEPDIR)/$(am__dirstamp)
-libbitwise-plugin.la: $(libbitwise_plugin_la_OBJECTS) $(libbitwise_plugin_la_DEPENDENCIES) $(EXTRA_libbitwise_plugin_la_DEPENDENCIES)
+libbitwise-plugin.la: $(libbitwise_plugin_la_OBJECTS) $(libbitwise_plugin_la_DEPENDENCIES)
$(libbitwise_plugin_la_LINK) $(am_libbitwise_plugin_la_rpath) $(libbitwise_plugin_la_OBJECTS) $(libbitwise_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/chainingdb/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/chainingdb
@@ -3264,7 +3228,7 @@ ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_unbind.lo: \
ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_utils.lo: \
ldap/servers/plugins/chainingdb/$(am__dirstamp) \
ldap/servers/plugins/chainingdb/$(DEPDIR)/$(am__dirstamp)
-libchainingdb-plugin.la: $(libchainingdb_plugin_la_OBJECTS) $(libchainingdb_plugin_la_DEPENDENCIES) $(EXTRA_libchainingdb_plugin_la_DEPENDENCIES)
+libchainingdb-plugin.la: $(libchainingdb_plugin_la_OBJECTS) $(libchainingdb_plugin_la_DEPENDENCIES)
$(libchainingdb_plugin_la_LINK) -rpath $(serverplugindir) $(libchainingdb_plugin_la_OBJECTS) $(libchainingdb_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/collation/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/collation
@@ -3281,7 +3245,7 @@ ldap/servers/plugins/collation/libcollation_plugin_la-config.lo: \
ldap/servers/plugins/collation/libcollation_plugin_la-orfilter.lo: \
ldap/servers/plugins/collation/$(am__dirstamp) \
ldap/servers/plugins/collation/$(DEPDIR)/$(am__dirstamp)
-libcollation-plugin.la: $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_DEPENDENCIES) $(EXTRA_libcollation_plugin_la_DEPENDENCIES)
+libcollation-plugin.la: $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_DEPENDENCIES)
$(libcollation_plugin_la_LINK) -rpath $(serverplugindir) $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/cos/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/cos
@@ -3295,7 +3259,7 @@ ldap/servers/plugins/cos/libcos_plugin_la-cos.lo: \
ldap/servers/plugins/cos/libcos_plugin_la-cos_cache.lo: \
ldap/servers/plugins/cos/$(am__dirstamp) \
ldap/servers/plugins/cos/$(DEPDIR)/$(am__dirstamp)
-libcos-plugin.la: $(libcos_plugin_la_OBJECTS) $(libcos_plugin_la_DEPENDENCIES) $(EXTRA_libcos_plugin_la_DEPENDENCIES)
+libcos-plugin.la: $(libcos_plugin_la_OBJECTS) $(libcos_plugin_la_DEPENDENCIES)
$(libcos_plugin_la_LINK) -rpath $(serverplugindir) $(libcos_plugin_la_OBJECTS) $(libcos_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/deref/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/deref
@@ -3306,7 +3270,7 @@ ldap/servers/plugins/deref/$(DEPDIR)/$(am__dirstamp):
ldap/servers/plugins/deref/libderef_plugin_la-deref.lo: \
ldap/servers/plugins/deref/$(am__dirstamp) \
ldap/servers/plugins/deref/$(DEPDIR)/$(am__dirstamp)
-libderef-plugin.la: $(libderef_plugin_la_OBJECTS) $(libderef_plugin_la_DEPENDENCIES) $(EXTRA_libderef_plugin_la_DEPENDENCIES)
+libderef-plugin.la: $(libderef_plugin_la_OBJECTS) $(libderef_plugin_la_DEPENDENCIES)
$(libderef_plugin_la_LINK) -rpath $(serverplugindir) $(libderef_plugin_la_OBJECTS) $(libderef_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/rever/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/rever
@@ -3320,7 +3284,7 @@ ldap/servers/plugins/rever/libdes_plugin_la-des.lo: \
ldap/servers/plugins/rever/libdes_plugin_la-rever.lo: \
ldap/servers/plugins/rever/$(am__dirstamp) \
ldap/servers/plugins/rever/$(DEPDIR)/$(am__dirstamp)
-libdes-plugin.la: $(libdes_plugin_la_OBJECTS) $(libdes_plugin_la_DEPENDENCIES) $(EXTRA_libdes_plugin_la_DEPENDENCIES)
+libdes-plugin.la: $(libdes_plugin_la_OBJECTS) $(libdes_plugin_la_DEPENDENCIES)
$(libdes_plugin_la_LINK) -rpath $(serverplugindir) $(libdes_plugin_la_OBJECTS) $(libdes_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/distrib/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/distrib
@@ -3331,7 +3295,7 @@ ldap/servers/plugins/distrib/$(DEPDIR)/$(am__dirstamp):
ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo: \
ldap/servers/plugins/distrib/$(am__dirstamp) \
ldap/servers/plugins/distrib/$(DEPDIR)/$(am__dirstamp)
-libdistrib-plugin.la: $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_DEPENDENCIES) $(EXTRA_libdistrib_plugin_la_DEPENDENCIES)
+libdistrib-plugin.la: $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_DEPENDENCIES)
$(libdistrib_plugin_la_LINK) -rpath $(serverplugindir) $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/dna/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/dna
@@ -3342,7 +3306,7 @@ ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp):
ldap/servers/plugins/dna/libdna_plugin_la-dna.lo: \
ldap/servers/plugins/dna/$(am__dirstamp) \
ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp)
-libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES) $(EXTRA_libdna_plugin_la_DEPENDENCIES)
+libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES)
$(libdna_plugin_la_LINK) $(am_libdna_plugin_la_rpath) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/http/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/http
@@ -3356,7 +3320,7 @@ ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo: \
ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo: \
ldap/servers/plugins/http/$(am__dirstamp) \
ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp)
-libhttp-client-plugin.la: $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_DEPENDENCIES) $(EXTRA_libhttp_client_plugin_la_DEPENDENCIES)
+libhttp-client-plugin.la: $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_DEPENDENCIES)
$(libhttp_client_plugin_la_LINK) -rpath $(serverplugindir) $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_LIBADD) $(LIBS)
ldap/servers/plugins/linkedattrs/$(am__dirstamp):
@$(MKDIR_P) ldap/servers/plugins/linkedattrs
@@ -3370,7 +3334,7 @@ ldap/servers/plugins/linkedattrs/liblinkedattrs_plugin_la-fixup_task.lo: \
ldap/servers/plugins/linkedattrs/liblinkedattrs_plugin_la-linked_attrs.lo: \
ldap/servers/plugins/linkedattrs/$(am__dirstamp) \
ldap/servers/plugins/linkedattrs/$(DEPDIR)/$(am__dirstamp)
-liblinkedattrs-plugin.la: $(liblinkedattrs_plugin_la_OBJECTS) $(liblinkedattrs_plugin_la_DEPENDENCIES) $(EXTRA_liblinkedattrs_plugin_la_DEPENDENCIES)
More information about the Pkg-fedora-ds-maintainers
mailing list