VERSION.sh
by Richard Allen Megginson
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 128fd1c5c696622b338c7224fec5a14d7111285b
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed May 26 15:41:51 2010 -0600
bump to version 1.1.11.a5
diff --git a/VERSION.sh b/VERSION.sh
index 307f56a..f79c872 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -15,7 +15,7 @@ VERSION_MAINT=11
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a4
+VERSION_PREREL=.a5
# 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.
13 years, 4 months
- 1
- 0
Changes to 'refs/tags/389-admin-1.1.11.a4'
by Richard Allen Megginson
Changes since 389-admin-1.1.11.a1:
Endi S. Dewata (1):
Bug 368481 - Unable to change Admin Server log paths in Console
Nathan Kinder (5):
Make check for threaded httpd work with Apache 2.0
Bug 460209 - Correct configure help message
Bug 570912 - Avoid selinux context conflict with httpd
Change parsing of start-slapd for instance name
Bug 570912 - dirsrv-admin SELinux module fails to install on F-13
Noriko Hosoi (2):
560827 - Admin Server templates: DistinguishName validation fails
560827 - Admin Server: DistinguishName validation fails
Rich Megginson (6):
bump version to 1.1.11.a2
Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong loca
bump version to 1.1.11.a3
SELinux is preventing /usr/lib64/dirsrv/cgi-bin/viewlog "ioctl" access on
start of 1.1.11.a4
Bug 593392 - setup-ds-admin.pl -k creates world readable file
---
Makefile.am | 2
Makefile.in | 2
VERSION.sh | 2
admserv/cgi-src40/config.c | 46 ++++----
admserv/cgi-src40/htmladmin.c | 15 ++
admserv/newinst/src/AdminUtil.pm.in | 8 +
admserv/newinst/src/dirserver.map.in | 1
admserv/newinst/src/migrate-ds-admin.pl.in | 13 +-
admserv/newinst/src/register_param.map.in | 1
admserv/newinst/src/setup-ds-admin.pl.in | 8 -
admserv/schema/ldif/00nsroot_backend.ldif.tmpl | 5
admserv/schema/ldif/01nsroot.ldif.tmpl | 26 ++--
admserv/schema/ldif/02globalpreferences.ldif.tmpl | 46 ++++----
admserv/schema/ldif/10dsdata.ldif.tmpl | 64 +++++------
admserv/schema/ldif/10rm_dsdata.ldif.tmpl | 10 -
admserv/schema/ldif/11dstasks.ldif.tmpl | 68 ++++++------
admserv/schema/ldif/12dsconfig.mod.tmpl | 6 -
admserv/schema/ldif/13dsschema.mod.tmpl | 6 -
admserv/schema/ldif/16dssuffixadmin.mod.tmpl | 6 -
admserv/schema/ldif/20asdata.ldif.tmpl | 54 ++++-----
admserv/schema/ldif/21astasks.ldif.tmpl | 78 +++++++-------
admserv/schema/ldif/22ascommands.ldif.tmpl | 8 -
admserv/schema/ldif/asmigrate.ldif.tmpl | 10 -
configure | 115 ++++++++++++++------
configure.ac | 31 ++++-
include/libadmin/libadmin.h | 13 ++
lib/libadmin/util.c | 121 ++++++++++++++++++++++
lib/libdsa/dsalib_location.c | 11 --
m4/httpd.m4 | 15 +-
selinux/dirsrv-admin.te | 6 -
30 files changed, 510 insertions(+), 287 deletions(-)
---
13 years, 4 months
- 1
- 0
VERSION.sh
by Richard Allen Megginson
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9efd0ba775b82174921e70706090a0cea5e9830a
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed May 26 15:32:42 2010 -0600
bump version to 1.2.6.a5
diff --git a/VERSION.sh b/VERSION.sh
index 14cef06..014c49e 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -14,7 +14,7 @@ VERSION_MAINT=6
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a4
+VERSION_PREREL=.a5
# 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.
13 years, 4 months
- 1
- 0
Changes to 'refs/tags/389-ds-base-1.2.6.a4'
by Richard Allen Megginson
Changes since 389-ds-base-1.2.6.a1:
Endi S. Dewata (12):
Bug 545620 - Password cannot start with minus sign
Bug 538525 - Ability to create instance as non-root user
Bug 570542 - Root password cannot contain matching curly braces
Bug 470684 - Pam_passthru plugin doesn't verify account activation
Bug 573375 - MODRDN operation not logged
Bug 520151 - Error when modifying userPassword with proxy user
Bug 455489 - Address compiler warnings about strict-aliasing rules
Bug 566320 - RFE: add exception to removal of attributes in cn=config for aci
Bug 566043 - startpid file is only cleaned by initscript runs
Bug 584109 - Slapd crashes while parsing DNA configuration
Bug 542570 - Directory Server port number is not validated in the beginning.
Bug 145181 - Plugin target/bind subtrees only take 1 value.
Nathan Kinder (14):
Bug 549554 - Trim single-valued attributes before sending to AD
Improve search for pcre header file
Bug 434735 - Allow SASL ANONYMOUS mech to work
Bug 570912 - Avoid selinux context conflict with httpd
Allow instance name to be parsed from start-slapd
Add managed entries plug-in
Bug 572355 - Label instance files and ports during upgrade.
Bug 578863 - Password modify extop needs to send referrals on replicas
Bug 584156 - Remove ldapi socket file during upgrade
Fix rsearch usage of name files for random filters
Bug 584497 - Allow DNA plugin to set same value on multiple attributes
Add replication session hooks
Correct function prototype for repl session hook
Bug 592389 - Set anonymous resource limits properly
Noriko Hosoi (41):
544089 - Referential Integrity Plugin does not take into account the attribute
557224 - subtree rename breaks the referential integrity plug-in
247413 - Incorrect error on multiple identical value add
559016 - Attempting to rename suffix returns inappropriate errors
555577 - Syntax validation fails for "ou=NetscapeRoot" tree
Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree
560827 - Admin Server templates: DistinguishName validation fails
548535 - memory leak in attrcrypt
563365 - Error handling problems in the backend functions
565664 - Incorrect parameter for CACHE_RETURN()
565987 - redhat-ds-base fails to build due to undefined struct
527848 - make sure db upgrade to 4.7 and later works correctly
539618 - Replication bulk import reports Invalid read/write
567370 - dncache: assertion failure in id2entry_delete
548115 - memory leak in schema reload
555970 - missing read lock in the combination of cos and nsview
539618 - Replication bulk import reports Invalid read/write
570667 - MMR: simultaneous total updates on the masters cause
Merge branch '547503'
Revert "Merge branch '547503'"
Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external
199923 - subtree search fails to find items under a db
570107 - The import of LDIFs with base-64 encoded DNs fails,
572649 - DS8.2 crashes on RHEL 4 (corresponding to bob, ber_2 test case)
573060 - DN normalizer: ESC HEX HEX is not normalized (
573896 - initializing subtree with invalid syntax crashes ns-slapd
515805 - Stop "initialize Database" crashes the server
548533 - memory leak in Repl_5_Inc_Protocol_new
Fixing a syntax error
Update to New DN Format
585905 - ACL with targattrfilters error crashes the server
574167 - An escaped space at the end of the RDN value is not
590931 - rhds81 import - hardcoded pages_limit for nsslapd-import-cache-autosize
591336 - Implementing upgrade DN format tool
593453 - Creating password policy with ns-newpolicy.pl on Replicated
593110 - backup-restore does not ALWAYS work
593899 - adding specific ACI causes very large mem allocate request
588867 - entryusn plugin fails on solaris
593899 - adding specific ACI causes very large mem allocate request
595893 - Base DN in SASL mapping is not normalized
511112 - Password history limited to 25 values
Rich Megginson (45):
Net::LDAP password modify extop breaks; msgid in response is 0xFF
Clean up assert for entrydn
Bug 543080 - Bitwise plugin fails to return the exact matched entries for Bitwise search filter
Bug 537466 - nsslapd-distribution-plugin should not require plugin name to begin with "lib"
bump version to 1.2.6.a2
Do not use syntax plugins directly for filters, indexing
wrap new style matching rule plugins for use in old style indexing code
change extensible filter code to use new syntax function style mr funcs
change syntax plugins to register required matching rule plugins
crash looking up compat syntax; numeric string syntax using integer; make octet string ordering work correctly
fix memory leak in attr replace when replacement fails
fix dso linking issues found by fedora 13 linking
problems linking with -z defs
389 DS segfaults on libsyntax-plugin.so - part 1
389 DS segfaults on libsyntax-plugin.so - part 2
389 DS segfaults on libsyntax-plugin.so - part 3
Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS
Bug 568196 - Install DS8.2 on Solaris fails
Bug 568196 - Install DS8.2 on Solaris fails - part 2
Bug 551198 - LDAPI: incorrect logging to access log
bump version to 1.2.6.a3
fix various memory leaks
Bug 551198 - LDAPI: incorrect logging to access log - part 2
Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external
cleanup build warnings
Bug 571514 - upgrade to 1.2.6 should upgrade 05rfc4523.ldif (cert schema)
Bug 570905 - postalAddress syntax should allow empty lines (should allow $$)
Add support for additional schema/matching rules included with 389
Bug 572677 - Memory leak in searches including GER control
Bug 571677 - Busy replica on consumers when directly deleting a replication conflict
Bug 576074 - search filters with parentheses fail
Bug 567429 - slapd didn't close connection and get into CLOSE_WAIT state
Bug 578167 - repl. of mod/replace deletes multi-valued attrs
Bug 561575 - setup-ds-admin fails to supply nsds5ReplicaName when configuring via ConfigFile
Bug 572162 - the string "|*" within a search filter on a non-indexed attribute returns all elements.
Bug 576644 - segfault while multimaster replication (paired node won't find deleted entries)
start of 1.2.6.a4
Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot
Fix too few args for format warning in acllas
Bug 586571 - DS Console shows escaped DNs
Bug 591685 - Server instances Fail to Start on Solaris due to Library Path and pcre
bump console version to 1.2.3
Repl Session API needs to check for NULL api before init
Bug 593392 - setup-ds-admin.pl -k creates world readable file
Bug 595874 - 99user.ldif getting overpopulated
root (1):
Bug 480787 - Autoconf parameter --with and --without
---
.gitignore | 1
Makefile.am | 77
Makefile.in | 4647 +
VERSION.sh | 5
aclocal.m4 | 6884 --
compile | 21
config.guess | 302
config.h.in | 6
config.sub | 232
configure |30057 +++++-------
configure.ac | 41
depcomp | 172
include/i18n.h | 115
install-sh | 517
ldap/admin/src/scripts/10cleanupldapi.pl | 23
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5
ldap/admin/src/scripts/60upgradeschemafiles.pl | 2
ldap/admin/src/scripts/91upgradednformat.pl | 145
ldap/admin/src/scripts/DSCreate.pm.in | 132
ldap/admin/src/scripts/DSDialogs.pm | 4
ldap/admin/src/scripts/DSMigration.pm.in | 6
ldap/admin/src/scripts/DSUpdate.pm.in | 12
ldap/admin/src/scripts/DSUtil.pm.in | 106
ldap/admin/src/scripts/Inf.pm | 53
ldap/admin/src/scripts/Migration.pm.in | 19
ldap/admin/src/scripts/Setup.pm.in | 19
ldap/admin/src/scripts/migrate-ds.pl.in | 13
ldap/admin/src/scripts/remove-ds.pl.in | 28
ldap/admin/src/scripts/restart-dirsrv.in | 25
ldap/admin/src/scripts/setup-ds.pl.in | 7
ldap/admin/src/scripts/setup-ds.res.in | 9
ldap/admin/src/scripts/start-dirsrv.in | 32
ldap/admin/src/scripts/stop-dirsrv.in | 27
ldap/admin/src/scripts/template-bak2db.in | 2
ldap/admin/src/scripts/template-db2bak.in | 2
ldap/admin/src/scripts/template-db2index.in | 2
ldap/admin/src/scripts/template-db2ldif.in | 2
ldap/admin/src/scripts/template-dbverify.in | 2
ldap/admin/src/scripts/template-ldif2db.in | 2
ldap/admin/src/scripts/template-restart-slapd.in | 2
ldap/admin/src/scripts/template-restoreconfig.in | 4
ldap/admin/src/scripts/template-saveconfig.in | 4
ldap/admin/src/scripts/template-start-slapd.in | 3
ldap/admin/src/scripts/template-stop-slapd.in | 2
ldap/admin/src/scripts/template-suffix2instance.in | 4
ldap/admin/src/scripts/template-upgradedb.in | 4
ldap/admin/src/scripts/template-upgradednformat.in | 56
ldap/admin/src/scripts/template-vlvindex.in | 4
ldap/admin/src/slapd.inf.in | 2
ldap/ldif/template-bitwise.ldif.in | 6
ldap/ldif/template-dse.ldif.in | 12
ldap/ldif/template-suffix-db.ldif.in | 1
ldap/schema/01core389.ldif | 2
ldap/schema/02common.ldif | 3
ldap/schema/05rfc4523.ldif | 14
ldap/schema/10mep-plugin.ldif | 104
ldap/schema/30ns-common.ldif | 4
ldap/schema/60qmail.ldif | 4
ldap/servers/plugins/acl/acl.c | 61
ldap/servers/plugins/acl/acl.h | 9
ldap/servers/plugins/acl/acl_ext.c | 2
ldap/servers/plugins/acl/aclanom.c | 1
ldap/servers/plugins/acl/acleffectiverights.c | 49
ldap/servers/plugins/acl/acllas.c | 202
ldap/servers/plugins/acl/aclparse.c | 497
ldap/servers/plugins/acl/aclplugin.c | 8
ldap/servers/plugins/acl/aclproxy.c | 17
ldap/servers/plugins/acl/aclutil.c | 66
ldap/servers/plugins/bitwise/bitwise.c | 18
ldap/servers/plugins/chainingdb/cb_config.c | 10
ldap/servers/plugins/chainingdb/cb_init.c | 4
ldap/servers/plugins/chainingdb/cb_instance.c | 8
ldap/servers/plugins/cos/cos_cache.c | 127
ldap/servers/plugins/dna/dna.c | 521
ldap/servers/plugins/linkedattrs/fixup_task.c | 4
ldap/servers/plugins/mep/mep.c | 2255
ldap/servers/plugins/mep/mep.h | 124
ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 17
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 7
ldap/servers/plugins/referint/referint.c | 713
ldap/servers/plugins/replication/cl5_api.c | 44
ldap/servers/plugins/replication/legacy_consumer.c | 1
ldap/servers/plugins/replication/repl-session-plugin.h | 119
ldap/servers/plugins/replication/repl5.h | 40
ldap/servers/plugins/replication/repl5_agmt.c | 48
ldap/servers/plugins/replication/repl5_agmtlist.c | 3
ldap/servers/plugins/replication/repl5_connection.c | 80
ldap/servers/plugins/replication/repl5_inc_protocol.c | 16
ldap/servers/plugins/replication/repl5_init.c | 4
ldap/servers/plugins/replication/repl5_prot_private.h | 4
ldap/servers/plugins/replication/repl5_protocol.c | 86
ldap/servers/plugins/replication/repl5_protocol_util.c | 506
ldap/servers/plugins/replication/repl5_replica.c | 36
ldap/servers/plugins/replication/repl5_replica_config.c | 1
ldap/servers/plugins/replication/repl5_tot_protocol.c | 19
ldap/servers/plugins/replication/repl_extop.c | 249
ldap/servers/plugins/replication/repl_init.c | 1
ldap/servers/plugins/replication/repl_session_plugin.c | 188
ldap/servers/plugins/replication/test_repl_session_plugin.c | 335
ldap/servers/plugins/replication/windows_protocol_util.c | 203
ldap/servers/plugins/retrocl/retrocl.c | 3
ldap/servers/plugins/retrocl/retrocl_create.c | 13
ldap/servers/plugins/retrocl/retrocl_po.c | 4
ldap/servers/plugins/syntaxes/bin.c | 142
ldap/servers/plugins/syntaxes/bitstring.c | 36
ldap/servers/plugins/syntaxes/ces.c | 140
ldap/servers/plugins/syntaxes/cis.c | 284
ldap/servers/plugins/syntaxes/dn.c | 42
ldap/servers/plugins/syntaxes/int.c | 64
ldap/servers/plugins/syntaxes/nameoptuid.c | 41
ldap/servers/plugins/syntaxes/numericstring.c | 118
ldap/servers/plugins/syntaxes/string.c | 177
ldap/servers/plugins/syntaxes/syntax.h | 57
ldap/servers/plugins/syntaxes/syntax_common.c | 117
ldap/servers/plugins/syntaxes/tel.c | 62
ldap/servers/plugins/syntaxes/validate.c | 13
ldap/servers/plugins/syntaxes/value.c | 90
ldap/servers/plugins/usn/usn_cleanup.c | 11
ldap/servers/plugins/views/views.c | 4
ldap/servers/slapd/add.c | 53
ldap/servers/slapd/attr.c | 76
ldap/servers/slapd/attrlist.c | 6
ldap/servers/slapd/attrsyntax.c | 75
ldap/servers/slapd/auth.c | 50
ldap/servers/slapd/back-ldbm/ancestorid.c | 6
ldap/servers/slapd/back-ldbm/back-ldbm.h | 14
ldap/servers/slapd/back-ldbm/dblayer.c | 318
ldap/servers/slapd/back-ldbm/dblayer.h | 8
ldap/servers/slapd/back-ldbm/dbversion.c | 47
ldap/servers/slapd/back-ldbm/filterindex.c | 76
ldap/servers/slapd/back-ldbm/id2entry.c | 12
ldap/servers/slapd/back-ldbm/import-threads.c | 799
ldap/servers/slapd/back-ldbm/import.c | 360
ldap/servers/slapd/back-ldbm/import.h | 18
ldap/servers/slapd/back-ldbm/index.c | 20
ldap/servers/slapd/back-ldbm/init.c | 2
ldap/servers/slapd/back-ldbm/ldbm_add.c | 77
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 115
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 46
ldap/servers/slapd/back-ldbm/ldbm_config.c | 90
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 73
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 32
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 50
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 167
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 25
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 84
ldap/servers/slapd/back-ldbm/ldbm_search.c | 1
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 253
ldap/servers/slapd/back-ldbm/matchrule.c | 26
ldap/servers/slapd/back-ldbm/misc.c | 102
ldap/servers/slapd/back-ldbm/nextid.c | 2
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 12
ldap/servers/slapd/back-ldbm/sort.c | 8
ldap/servers/slapd/back-ldbm/start.c | 2
ldap/servers/slapd/back-ldbm/vlv.c | 100
ldap/servers/slapd/back-ldbm/vlv_srch.c | 4
ldap/servers/slapd/back-ldbm/vlv_srch.h | 3
ldap/servers/slapd/backend.c | 29
ldap/servers/slapd/backend_manager.c | 6
ldap/servers/slapd/bind.c | 149
ldap/servers/slapd/compare.c | 31
ldap/servers/slapd/configdse.c | 10
ldap/servers/slapd/connection.c | 37
ldap/servers/slapd/daemon.c | 39
ldap/servers/slapd/delete.c | 31
ldap/servers/slapd/dn.c | 969
ldap/servers/slapd/dse.c | 13
ldap/servers/slapd/dynalib.c | 27
ldap/servers/slapd/entry.c | 279
ldap/servers/slapd/entrywsi.c | 54
ldap/servers/slapd/extendop.c | 37
ldap/servers/slapd/fedse.c | 1
ldap/servers/slapd/filter.h | 1
ldap/servers/slapd/filtercmp.c | 19
ldap/servers/slapd/filterentry.c | 23
ldap/servers/slapd/ldaputil.c | 75
ldap/servers/slapd/libglobs.c | 51
ldap/servers/slapd/libslapd.def | 1
ldap/servers/slapd/main.c | 132
ldap/servers/slapd/mapping_tree.c | 196
ldap/servers/slapd/match.c | 57
ldap/servers/slapd/modify.c | 35
ldap/servers/slapd/modrdn.c | 133
ldap/servers/slapd/modutil.c | 30
ldap/servers/slapd/passwd_extop.c | 87
ldap/servers/slapd/pblock.c | 122
ldap/servers/slapd/plugin.c | 110
ldap/servers/slapd/plugin_mr.c | 472
ldap/servers/slapd/plugin_syntax.c | 340
ldap/servers/slapd/protect_db.c | 9
ldap/servers/slapd/protect_db.h | 2
ldap/servers/slapd/proto-slap.h | 30
ldap/servers/slapd/pw.c | 144
ldap/servers/slapd/pw_mgmt.c | 136
ldap/servers/slapd/result.c | 4
ldap/servers/slapd/saslbind.c | 29
ldap/servers/slapd/schema.c | 34
ldap/servers/slapd/search.c | 35
ldap/servers/slapd/slap.h | 50
ldap/servers/slapd/slapi-plugin-compat4.h | 6
ldap/servers/slapd/slapi-plugin.h | 149
ldap/servers/slapd/slapi-private.h | 17
ldap/servers/slapd/slapi_counter.c | 6
ldap/servers/slapd/snmp_collator.c | 3
ldap/servers/slapd/task.c | 79
ldap/servers/slapd/tools/dbscan.c | 2
ldap/servers/slapd/tools/ldclt/ldapfct.c | 96
ldap/servers/slapd/tools/ldclt/ldclt.c | 19
ldap/servers/slapd/tools/ldclt/ldclt.h | 2
ldap/servers/slapd/tools/ldclt/ldcltU.c | 24
ldap/servers/slapd/tools/rsearch/searchthread.c | 2
ldap/servers/slapd/util.c | 106
ldap/servers/slapd/value.c | 26
ldap/servers/slapd/valueset.c | 66
lib/libsi18n/coreres.c | 141
lib/libsi18n/coreres.h | 52
lib/libsi18n/getlang.c | 330
lib/libsi18n/getstrmem.c | 160
lib/libsi18n/getstrprop.c | 85
lib/libsi18n/propset.c | 442
lib/libsi18n/propset.h | 80
ltmain.sh | 8473 +--
m4/db.m4 | 21
m4/fhs.m4 | 4
m4/icu.m4 | 25
m4/kerberos.m4 | 4
m4/mozldap.m4 | 32
m4/netsnmp.m4 | 15
m4/nspr.m4 | 17
m4/nss.m4 | 17
m4/openldap.m4 | 16
m4/pcre.m4 | 28
m4/sasl.m4 | 25
m4/selinux.m4 | 16
m4/svrcore.m4 | 41
missing | 104
selinux/dirsrv.if | 20
wrappers/initscript.in | 2
wrappers/migratecred.in | 2
wrappers/mmldif.in | 2
wrappers/pwdhash.in | 2
241 files changed, 37245 insertions(+), 32907 deletions(-)
---
13 years, 4 months
- 1
- 0
Changes to 'refs/tags/Directory_Server_8_2_Candidate_20100526'
by Richard Allen Megginson
Changes since the dawn of time:
Endi S. Dewata (1):
Bug 368481 - Unable to change Admin Server log paths in Console
Nathan Kinder (46):
removed SNMP, updated components, and added rebranded graphics
150479 - SHLIB_PATH setting incorrect on HP-UX
Update components and use new RHEL platform naming
Pick up new nescore component
Pick up new nescore component
Changes to use IBM JRE
Branding fixes
Use zip instead of compress for packaging
Use gzip instead of zip for packaging uxmcc.tar
Fix JSS component path
Removed unneccesary package that was failing on Windows
Update doc packaging for windows build failure
Pull components from component area instead on integration
Package ICU resource bundle
Fixed whitespace issue
Need to put resource bundle in proper directory
Need to create res directory for packaging
Fixed packaging makefile error
Pick up new components and package Cgistub
Don't package ns-common-schema.conf
Removed legacy plugin info
154855 - Don't package Ant jars
Update consolesdk component
Updated NESCORE component
Pick up new components
171667 - Pick up new console component and enable fedora component pulling
172812 - Don't overwrite ANT_HOME on on external builds. Also don't package ant jarfiles in the console java directory.
Admin Express cgi needs NESCompatEnv set for help to work
Resolves: 245665
Resolves: 245665
Resolves: 246020
Summary: Fixed an annoying typo in a comment.
Resolves: 247283
Resolves: 251418
Resolves: 251418
Resolves: 253760
Resolves: 258341
Resolves: 370071
Resolves: 370071
Resolves: 445305
Resolves: 430364
Resolves: 430364
Resolves: bug 486402
Get rundir from sysconfig script.
Make check for threaded httpd work with Apache 2.0
Change parsing of start-slapd for instance name
Noriko Hosoi (89):
bugzilla 147535: De-brand the Administration Server as "brandx"
[147535] Brand the Administration Server as "Fedora"
WARNING: This is a space holder for the license file.
removed obsolete URLs.
switching ext/int in components.mk
updated copyright string.
Removed "return home" to home.netscape.com.
Introduced a gmake macro BUILD_MODE (= ext or int) to control packaging/non-packaging Admin Server guide.
[147522] Brand the Admin SDK as "Fedora"
Put 'scrollbars=yes' for showing the scrollbars on Firefox.
1) ant 1.6.2; 2) DBM_1_61_RTM; 3) NSS_3_9_3_RTM; 4) LDAP C SDK v5.14; 5) JSS_3_5_1_RTM
Pick up docs from the component area; (need to remove admserv/manual/help/manual
package <nescore>/bin/https/dtds; developer.netscape.com used to host for the NES dtd files, but it was shutdown after the Red Hat acquisition. Now we are switching to have the dtd files in the server package.
- picking up the latest consolesdk from /s/b/sbsintegration
Removed the dependency on the rule: pkguxSNMP.
typo for BUILD_MODE.
1) pick up new setupsdk, consolesdk.
Changed "{Fedora,Red Hat} Project" to "{Fedora Project,Red Hat} Home Page" on the admin main page.
[154431] Security package requests from Cert Team; added .chk files
[154431] Security package requests from Cert Team
[148004] Rebranding: new Contact info / URLs
[154189] picking up the new consolesdk 20050512
[169320] Admin Server branding mismatches
[164401] Clean up Admin Server build
171942 – Change Admin Server version to 1.0
Adjusted Admin Util and Console build path for the external build.
[175418] Admin Server ns-update crashes if necessary attribute-value is not given
[179394] HP-UX IPF support (adminserver)
[Bug 186105] Admin Server Makefile updates for Internal build
[186105] Admin Server Makefile updates for Internal build
[186105] Admin Server Makefile updates for Internal build
[186105] Admin Server Makefile updates for Internal build
[186105] Admin Server Makefile updates for Internal build
Picking up new AdminUtil, SetupUtil, and Console.
[186105] Admin Server Makefile updates for Internal build
Picking up new console.
[186642] Directory Server Makefile updates for Internal build
Updated SETUPUTIL_RELDATE to 20060405.
[161099] admin passwd in clear text in adm.conf
[161099] admin passwd in clear text in adm.conf
Added NSPR libraries to the dependency (ns-update). (fixed the build)
[195258] Changes for the internal build
[195258] Changes for the internal build
[191832] Admin Server password always remembers initial password on (part 2)
[195258] Changes for the internal build:
[195258] Changes for the internal build
[195258] Changes for the internal build
[195258] Changes for the internal build; comment#14
Resolves: #237356
Resolves: #237356
Removed an unnecessary entry.
Resolves: 237356
Resolves: #244325
Resolves: 237356
Resolves: #237356
Resolves #244715
Resolves: #237356
Resolves: #244749
Resolves: #244749
Resolves: #244749
Resolves: #244749
Resolves: #244749
Resolves: #244749
Resolves: #244749
Resolves: #244749
Resolves: #247215
Resolves: #247215
Resolves: #246683
resolves: #247215
resolves: #249739
Resolves: #203999
Resolves: #214276
Resolves: #251090
Resolves: # 251595
Resolves: #252190
Resolves: #253811
Resolves: #273501
One character fix: added ';'
Resolves: #251090
Resolves: #357501
Resolves: #411231
Resolves: #191779
Resolves: #191834
Resolves: #476096
Resolves: #476096
setup-ds-admin.pl Fix for objectclass violation
490997 Obsolete ACI in o=netscaperoot
560827 - Admin Server templates: DistinguishName validation fails
560827 - Admin Server: DistinguishName validation fails
Rich Megginson (207):
added config file templates
added functions to replace tokens in template scripts and config files
Bug(s) fixed: 163375
Bug(s) fixed: 163624
Bug(s) fixed: 163714
Bug(s) fixed: 163730
Bug(s) fixed: 164401
removing unused files
removed unused files
removing unused files
removed unused files
removed unused files
removed unused files
Bug(s) fixed: 166273
Bug(s) fixed: 166380
fix build breakage on RHEL3 - do not need admin server dsgw stuff anymore
Bug(s) fixed: 167325
Bug(s) fixed: 167345
Bug(s) fixed: 167865
Bug(s) fixed: 167866
Bug(s) fixed: 167867
Bug(s) fixed: 167867
Bug(s) fixed: 167869
Bug(s) fixed: 169155
fix some internal build related issues
change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup
use open source console help docs
replace the incorrect one with the correct fedora branded graphic
by default, use the console ldapjdk.jar and JSS for building and packaging admin server
Bug(s) fixed: 171066
Bug(s) fixed: 172249
Bug(s) fixed: 172402
Bug(s) fixed: 172816
allow developers to build an adminserver with the 3 Apache modules included for convenience but not packaging
put the Apache modules back into the packaging - the gpl is compatible with the apl in this specific instance - also enable using ant and java from PATH by default for external builds
Add the create CGI to the list of CGIs which mod_restartd is allowed to execute.
Admin server post install was core dumping in express mode because it did
1) default cert name is server-cert not Server-Cert
Write changes to console.conf, not nss.conf
Make sure the server uid owns the config directory and the other config files
Package libjss3.so in lib, not lib/jss
patch file to convert admin server version 1.0 files to version 1.0.1
patch to convert libldap- to libldap
Bug(s) fixed: 174837
Bump version from 1.0 to 1.0.1
do not overwrite the dynamic console.conf file when upgrading
Bug(s) fixed: 175187
Change packaging so that either the old style adminutil properties or the
make sure /opt/fedora-ds/shared/lib is used for shared libs used by the console
whoops - I left the - at the beginning of the mkdir command
look for the java command in java_home/bin
bug 175170
It's a little bit tricky. The base package is a dependency of both the main admin server package and the directory server package. However, it works if you just create a zero length .zip file for the base archive - you get a warning when running setup, but everything installs correctly. While it's not perfect (it will be addressed for the next major release) it will at least allow those developers who do not want to use java at all to build and install.
Use NSS 3.11 and NSPR 4.6.1 - This requires packaging the new freebl3
Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime
Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package.
The correct naming convention for RHEL is
NSPLATFORM_DIR is set differently for linux than for other platforms
1) Fix moz objdir name for generic linux x86_64
Added httpd-2.2.conf.tmpl - Apache 2.2 uses different modules than 2.0 for auth/authz
Apache 2.2 uses different modules for auth/authz than 2.0. This change allows admin server post install to figure out what version of Apache is being used (via httpd -v) and select the appropriate httpd.conf template file based on that version.
Change admin server version to 1.0.2
replace %%% tokens with the real default paths, otherwise patch won't work
Still need the console ld lib path patch for startconsole
still need the console ld libpath patch for startconsole
Have to add back softokn3 to the link line - adminutil, setuputil, and ldapsdk didn't remove them as dependencies, so the linker forces it to be present at link time.
remove hardcoded reference to /home/rich - should be %%%sroot%%%
patch file for upgrading from 1.0.1 - fixes the use of admpw for basic auth
added patch file for upgrading from 1.0.1 - fixes the use of admpw for basic auth
this patch fixes the use of admpw in the actual config file - the previous patch only fixes the template
added admserv-conf-admpw.patch to patch the real config file - the previous patch only patches the template config file
Bug(s) fixed: 186280
Bug: 186280
Bug: 192785
admin server console has been moved to top level admservconsole
These files are obsolete.
renamed util.cpp to nscputil.cpp to avoid object/file naming conflict in autoconf builds
removed admconf.c admserv.c pasword.c
renamed the files from .h to .html - they are html files after all
remove obsolete files
remove obsolete files
remove obsolete files
remove obsolete files
bump version to 1.0.3
use new ldapcsdk 6.0.0; upgrade other components
Bug(s) fixed: 210180
use libldap60 in preload
assume the ld_preload thing has already been patched by installing or upgrading to fds102 - this patch only upgrades libldap50 to libldap60 from now on
startconsole has changed for fds103, so the patch needs to change too
Now that the LDAP C SDK is linked with SASL by default, other executables
Resolves: bug 210916
Resolves: bug 239502, bug 186280
rename scripts to x-ds-admin; fix uid change in config.c; remove obsolete snmp CGIs
Resolves: bug 239502
Resolves: bug 239502
Resolves: bug 239502
Resolves: bug 239502
Resolves: bug 239502
Resolves: bug 239502
Resolves: bug 237356
Resolves: bug 237356
Resolves: bug 237356
Resolves: bug 237356
remove obsolete files
Resolves: bug 245214
Resolves: bug 245214
Resolves: bug 244749
Resolves: bug 245815
Resolves: bug 246683
Resolves: bug 245815
Resolves: bug 248145
Resolves: bug 248184
Resolves: bug 248145
Resolves: bug 248145
remove obsolete files and directories
remove obsolete files
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server
remove AC_FUNC_REALLOC - breaks build in HPUX
need to set icu_libdir
need to set icu_libdir for the --with-icu case too
Resolves: bug 250324
Resolves: bug 250535
fix build breakage on rhel4
Reviewed by: nkinder (Thanks!)
Resolves: bug 251549
Resolves: bug 252190
Resolves: bug 252190
remove curses
Resolves: bug 288451
Resolves: bug 288451
Resolves: bug 295001
Resolves: bug 299261
Resolves: bug 304081
Resolves: bug 315731
Resolves: bug 248169
since we use the start script to start admin, we source the
Resolves: bug 317591
Resolves: bug 317651
Resolves: bug 367941
added spec files
Resolves: bug 186280
Resolves: bug 383301
Resolves: bug 368481
Resolves: bug 400421
Resolves: bug 407011
Resolves: bug 400221
Resolves: bug 420751
update to version 1.1.1
Resolves: bug 425861
Resolves: bug 425849
Resolves: bug 426056
Resolves: bug 249548
Resolves: CVE-2008-0892 and 437320
Resolves: bug 448366
Resolves: bug 431103
Reviewed by: nkinder (Thanks!)
Reviewed by: nkinder (Thanks!)
removing dead code
bump version to 1.1.6
Resolves: bug 431103
Resolves: bug 451702
Resolves: bug 448366
update for version 1.1.6
Resolves: bug 462411
Resolves: bug 470946
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc.
Resolves: bug 209242
Resolves: bug 426439
initial version 1.1.7 commit
Resolves: bug 480869
Resolves: bug 480869
Resolves: bug 483276
Resolves: bug 468474
Resolves: bug 166230
Resolves: bug 480869
actually add the -y argument
for the 1.1.7 release
Resolves: bug 493989
bump rev
Resolves: bug 494980
bump version for bug fix
rename to 389
Link libds-admin-serv with NSPR to avoid rpmlint missing weak symbol errors
Add more libs for libds-admin-serv to resolve rpmlint issues
yet more link issues with libds-admin-serv
change license from gplv2+ to plain gplv2
added 389-admin.spec
get rid of obsolete functions
bump version to 1.1.8 for fedora review
bump spec version to 1.1.8 for fedora review
use 389-adminutil instead of adminutil
Add support for new ds base update framework
Running setup-ds-admin.pl -u on replica with ldaps chokes on CA cert
389-ds-base/glibmm24: conflicting perl provides
setup-ds-admin.pl: Can't call method "getErrorString" on an undefined value at /usr/lib64/dirsrv/perl/AdminUtil.pm line 405.
setup-ds-admin.pl should use correct default hostname + port
Move mod_admserv and mod_restartd into adminserver
Bump version to 1.1.10
Allow use of unthreaded Apache
Add support for versioning via VERSION.sh - cleanup branding
Fix problem with genrb on F-12 and later
bump version to 1.1.10.a2
Allow configure to find genrb correctly on all platforms
this is version 1.1.10.a4
this is the 1.1.10 release
bump version to 1.1.11.a1
Bug 593392 - setup-ds-admin.pl -k creates world readable file
Rob Crittenden (10):
147495. Suppress bogus admin40_host_ip_check error message on startup.
147519 Allow the unauthenticated retrieval of /favicon.ico
Bug 162703
162703
Install an Apache-compatible configuration.
Fix build oops.
164525 In the stop script add kill -9 for the process group if a
164832 Got a little carried away when cleaning up kruft in bug 162703.
164853
Bug(s) fixed: 165240
cvsadm (2):
Move Admin Server from branch to TRUNK
Move Admin Server from branch to TRUNK
svrbld (2):
Use perl5 instead of perl for branding
fixed windows build failure: 1) missing unzipping manual components (newinst/insadm/Makefile); 2) makefile path mismatch (mcc/nt/makefile).
unknown (1):
This commit was manufactured by cvs2git to create branch
13 years, 4 months
- 1
- 0
admserv/newinst
by Richard Allen Megginson
admserv/newinst/src/AdminUtil.pm.in | 8 ++++++--
admserv/newinst/src/migrate-ds-admin.pl.in | 13 +++++++++----
admserv/newinst/src/setup-ds-admin.pl.in | 8 ++------
3 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit a5eb7a659963dd92e4237c3a03431bd6880111a7
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue May 25 12:18:46 2010 -0600
Bug 593392 - setup-ds-admin.pl -k creates world readable file
https://bugzilla.redhat.com/show_bug.cgi?id=593392
Resolves: bug 593392
Bug Description: setup-ds-admin.pl -k creates world readable file
Reviewed by: thoger (Thanks!)
Branch: HEAD
Fix Description: Use umask to make sure we create a .inf file that is
only viewable by the user. In addition, only create the temp file and
filename when necessary. In some places, the code was creating a .inf
file on disk when it could just create one in memory. The code should
check to see if the Inf object has a file associated with it before
attemtping to unlink it. Make sure we do not unlink a .inf file given
with -f on the command line. If the user specified -k, always write to
a temp file using __temp__ as the keyword to tell Inf->write to generate
a temp file.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
diff --git a/admserv/newinst/src/AdminUtil.pm.in b/admserv/newinst/src/AdminUtil.pm.in
index 3360aa8..d3808cc 100644
--- a/admserv/newinst/src/AdminUtil.pm.in
+++ b/admserv/newinst/src/AdminUtil.pm.in
@@ -698,7 +698,9 @@ sub registerManyDSWithConfigDS {
for my $inst (@instances) {
my $instinf = createInfFromConfig("$configdir/$inst", $inst);
- unlink($instinf->{filename});
+ if ($instinf->{filename}) {
+ unlink($instinf->{filename});
+ }
$instinf->{General}->{ConfigDirectoryLdapURL} =
$inf->{General}->{ConfigDirectoryLdapURL};
$instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
@@ -738,7 +740,9 @@ sub registerScatteredDSWithConfigDS {
for $configdir ( @configdirs ) {
foreach my $dsinst ( @{$instances_ref->{$configdir}} ) {
my $instinf = createInfFromConfig("$configdir/$dsinst", $dsinst);
- unlink($instinf->{filename});
+ if ($instinf->{filename}) {
+ unlink($instinf->{filename});
+ }
$instinf->{General}->{ConfigDirectoryLdapURL} =
$inf->{General}->{ConfigDirectoryLdapURL};
$instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
diff --git a/admserv/newinst/src/migrate-ds-admin.pl.in b/admserv/newinst/src/migrate-ds-admin.pl.in
index dfb82e0..dddd6be 100644
--- a/admserv/newinst/src/migrate-ds-admin.pl.in
+++ b/admserv/newinst/src/migrate-ds-admin.pl.in
@@ -73,9 +73,14 @@ $mig->msg('end_dsadmin_migration');
$mig->doExit(0);
END {
- if ($mig) {
- if (!$mig->{keep}) {
- unlink $mig->{inffile};
- }
+ if ($mig and $mig->{keep}) {
+ $mig->{inf}->write("__temp__");
}
}
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
diff --git a/admserv/newinst/src/setup-ds-admin.pl.in b/admserv/newinst/src/setup-ds-admin.pl.in
index 65c2d1a..edb0f2d 100644
--- a/admserv/newinst/src/setup-ds-admin.pl.in
+++ b/admserv/newinst/src/setup-ds-admin.pl.in
@@ -207,8 +207,6 @@ if (!defined($setup->{inf}->{General}->{SuiteSpotGroup})) {
# for admin server too, since ServerAdminID is used by AdminUtil code
AdminServer::setDefaults($setup);
-$setup->{inf}->write();
-
my @errs;
if (!$setup->{update}) {
@@ -305,10 +303,8 @@ if (!$setup->{reconfigas}) {
$setup->doExit(0);
END {
- if ($setup) {
- if (!$setup->{keep}) {
- unlink $setup->{inffile};
- }
+ if ($setup and $setup->{keep}) {
+ $setup->{inf}->write("__temp__");
}
}
13 years, 4 months
- 1
- 0
Branch 'Directory_Server_8_2_Branch' - admserv/newinst
by Richard Allen Megginson
admserv/newinst/src/AdminUtil.pm.in | 8 ++++++--
admserv/newinst/src/migrate-ds-admin.pl.in | 13 +++++++++----
admserv/newinst/src/setup-ds-admin.pl.in | 8 ++------
3 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit 72cf3dd8909cb1030559ef5b4471f23e795295e0
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue May 25 12:18:46 2010 -0600
Bug 593392 - setup-ds-admin.pl -k creates world readable file
https://bugzilla.redhat.com/show_bug.cgi?id=593392
Resolves: bug 593392
Bug Description: setup-ds-admin.pl -k creates world readable file
Reviewed by: thoger (Thanks!)
Branch: Directory_Server_8_2_Branch
Fix Description: Use umask to make sure we create a .inf file that is
only viewable by the user. In addition, only create the temp file and
filename when necessary. In some places, the code was creating a .inf
file on disk when it could just create one in memory. The code should
check to see if the Inf object has a file associated with it before
attemtping to unlink it. Make sure we do not unlink a .inf file given
with -f on the command line. If the user specified -k, always write to
a temp file using __temp__ as the keyword to tell Inf->write to generate
a temp file.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit a5eb7a659963dd92e4237c3a03431bd6880111a7)
diff --git a/admserv/newinst/src/AdminUtil.pm.in b/admserv/newinst/src/AdminUtil.pm.in
index 3360aa8..d3808cc 100644
--- a/admserv/newinst/src/AdminUtil.pm.in
+++ b/admserv/newinst/src/AdminUtil.pm.in
@@ -698,7 +698,9 @@ sub registerManyDSWithConfigDS {
for my $inst (@instances) {
my $instinf = createInfFromConfig("$configdir/$inst", $inst);
- unlink($instinf->{filename});
+ if ($instinf->{filename}) {
+ unlink($instinf->{filename});
+ }
$instinf->{General}->{ConfigDirectoryLdapURL} =
$inf->{General}->{ConfigDirectoryLdapURL};
$instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
@@ -738,7 +740,9 @@ sub registerScatteredDSWithConfigDS {
for $configdir ( @configdirs ) {
foreach my $dsinst ( @{$instances_ref->{$configdir}} ) {
my $instinf = createInfFromConfig("$configdir/$dsinst", $dsinst);
- unlink($instinf->{filename});
+ if ($instinf->{filename}) {
+ unlink($instinf->{filename});
+ }
$instinf->{General}->{ConfigDirectoryLdapURL} =
$inf->{General}->{ConfigDirectoryLdapURL};
$instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
diff --git a/admserv/newinst/src/migrate-ds-admin.pl.in b/admserv/newinst/src/migrate-ds-admin.pl.in
index dfb82e0..dddd6be 100644
--- a/admserv/newinst/src/migrate-ds-admin.pl.in
+++ b/admserv/newinst/src/migrate-ds-admin.pl.in
@@ -73,9 +73,14 @@ $mig->msg('end_dsadmin_migration');
$mig->doExit(0);
END {
- if ($mig) {
- if (!$mig->{keep}) {
- unlink $mig->{inffile};
- }
+ if ($mig and $mig->{keep}) {
+ $mig->{inf}->write("__temp__");
}
}
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
diff --git a/admserv/newinst/src/setup-ds-admin.pl.in b/admserv/newinst/src/setup-ds-admin.pl.in
index 65c2d1a..edb0f2d 100644
--- a/admserv/newinst/src/setup-ds-admin.pl.in
+++ b/admserv/newinst/src/setup-ds-admin.pl.in
@@ -207,8 +207,6 @@ if (!defined($setup->{inf}->{General}->{SuiteSpotGroup})) {
# for admin server too, since ServerAdminID is used by AdminUtil code
AdminServer::setDefaults($setup);
-$setup->{inf}->write();
-
my @errs;
if (!$setup->{update}) {
@@ -305,10 +303,8 @@ if (!$setup->{reconfigas}) {
$setup->doExit(0);
END {
- if ($setup) {
- if (!$setup->{keep}) {
- unlink $setup->{inffile};
- }
+ if ($setup and $setup->{keep}) {
+ $setup->{inf}->write("__temp__");
}
}
13 years, 4 months
- 1
- 0
ldap/servers
by Richard Allen Megginson
ldap/servers/slapd/schema.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 2e8fc55fcc185577d0973eae58f1f8f26cbd442b
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed May 26 12:18:34 2010 -0600
Bug 595874 - 99user.ldif getting overpopulated
https://bugzilla.redhat.com/show_bug.cgi?id=595874
Resolves: bug 595874
Bug Description: 99user.ldif getting overpopulated
Reviewed by: self
Branch: HEAD
Fix Description: The schema code was adding X-ORIGIN 'user defined' to all
schema elements that had no X-ORIGIN. It should only add user defined to
schema elements from the user defined schema file, not to schema defined
in standard (read only) schema files. It looks like the code should work
fine if the schema element has no origin, so there is no reason to add
an origin for schema other than user defined schema.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 56c1b54..72c4898 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -2976,8 +2976,14 @@ read_oc_ldif ( const char *input, struct objclass **oc, char *errorbuf,
if ( schema_ds4x_compat ) nextinput = input;
/* look for X-ORIGIN list */
- oc_origins = parse_origin_list( nextinput, &num_origins,
- schema_user_defined_origin );
+ if (is_user_defined) {
+ /* add X-ORIGIN 'user defined' */
+ oc_origins = parse_origin_list( nextinput, &num_origins,
+ schema_user_defined_origin );
+ } else {
+ /* add nothing */
+ oc_origins = parse_origin_list( nextinput, &num_origins, NULL );
+ }
/* set remaining flags */
if ( element_is_user_defined( oc_origins )) {
@@ -3377,8 +3383,14 @@ read_at_ldif(const char *input, struct asyntaxinfo **asipp, char *errorbuf,
if ( schema_ds4x_compat ) nextinput = input;
/* X-ORIGIN list */
- attr_origins = parse_origin_list( nextinput, &num_origins,
- schema_user_defined_origin );
+ if (is_user_defined) {
+ /* add X-ORIGIN 'user defined' */
+ attr_origins = parse_origin_list( nextinput, &num_origins,
+ schema_user_defined_origin );
+ } else {
+ /* add nothing */
+ attr_origins = parse_origin_list( nextinput, &num_origins, NULL );
+ }
/* Do some sanity checking to make sure everything was read correctly */
@@ -4561,9 +4573,11 @@ parse_origin_list( const char *schema_value, int *num_originsp,
origins[i] = NULL;
}
+/* for debugging
if ( origins == NULL || origins[0] == NULL ) {
LDAPDebug( LDAP_DEBUG_ANY, "no origin (%s)\n", schema_value, 0, 0 );
}
+*/
return origins;
}
13 years, 4 months
- 1
- 0
Branch 'Directory_Server_8_2_Branch' - ldap/servers
by Richard Allen Megginson
ldap/servers/slapd/schema.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
New commits:
commit df777e3de911e3b5428938a7f1c91b76678fb0e2
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed May 26 12:18:34 2010 -0600
Bug 595874 - 99user.ldif getting overpopulated
https://bugzilla.redhat.com/show_bug.cgi?id=595874
Resolves: bug 595874
Bug Description: 99user.ldif getting overpopulated
Reviewed by: self
Branch: Directory_Server_8_2_Branch
Fix Description: The schema code was adding X-ORIGIN 'user defined' to all
schema elements that had no X-ORIGIN. It should only add user defined to
schema elements from the user defined schema file, not to schema defined
in standard (read only) schema files. It looks like the code should work
fine if the schema element has no origin, so there is no reason to add
an origin for schema other than user defined schema.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit 2e8fc55fcc185577d0973eae58f1f8f26cbd442b)
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 45cfa5f..6a6fe4c 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -2976,8 +2976,14 @@ read_oc_ldif ( const char *input, struct objclass **oc, char *errorbuf,
if ( schema_ds4x_compat ) nextinput = input;
/* look for X-ORIGIN list */
- oc_origins = parse_origin_list( nextinput, &num_origins,
- schema_user_defined_origin );
+ if (is_user_defined) {
+ /* add X-ORIGIN 'user defined' */
+ oc_origins = parse_origin_list( nextinput, &num_origins,
+ schema_user_defined_origin );
+ } else {
+ /* add nothing */
+ oc_origins = parse_origin_list( nextinput, &num_origins, NULL );
+ }
/* set remaining flags */
if ( element_is_user_defined( oc_origins )) {
@@ -3377,8 +3383,14 @@ read_at_ldif(const char *input, struct asyntaxinfo **asipp, char *errorbuf,
if ( schema_ds4x_compat ) nextinput = input;
/* X-ORIGIN list */
- attr_origins = parse_origin_list( nextinput, &num_origins,
- schema_user_defined_origin );
+ if (is_user_defined) {
+ /* add X-ORIGIN 'user defined' */
+ attr_origins = parse_origin_list( nextinput, &num_origins,
+ schema_user_defined_origin );
+ } else {
+ /* add nothing */
+ attr_origins = parse_origin_list( nextinput, &num_origins, NULL );
+ }
/* Do some sanity checking to make sure everything was read correctly */
@@ -4561,9 +4573,11 @@ parse_origin_list( const char *schema_value, int *num_originsp,
origins[i] = NULL;
}
+/* for debugging
if ( origins == NULL || origins[0] == NULL ) {
LDAPDebug( LDAP_DEBUG_ANY, "no origin (%s)\n", schema_value, 0, 0 );
}
+*/
return origins;
}
13 years, 4 months
- 1
- 0
Branch 'Directory_Server_8_2_Branch' - ldap/admin
by Richard Allen Megginson
ldap/admin/src/scripts/DSMigration.pm.in | 6 ++-
ldap/admin/src/scripts/DSUtil.pm.in | 33 +++++--------------
ldap/admin/src/scripts/Inf.pm | 53 +++++++++++++++++++++++--------
ldap/admin/src/scripts/Migration.pm.in | 17 +--------
ldap/admin/src/scripts/Setup.pm.in | 17 +--------
ldap/admin/src/scripts/migrate-ds.pl.in | 13 +++++--
ldap/admin/src/scripts/setup-ds.pl.in | 7 +---
7 files changed, 68 insertions(+), 78 deletions(-)
New commits:
commit 84b40e3a1d249ec7d74a3d89ca1bb3294ab65e6d
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue May 25 12:15:18 2010 -0600
Bug 593392 - setup-ds-admin.pl -k creates world readable file
https://bugzilla.redhat.com/show_bug.cgi?id=593392
Resolves: bug 593392
Bug Description: setup-ds-admin.pl -k creates world readable file
Reviewed by: thoger (Thanks!)
Branch: Directory_Server_8_2_Branch
Fix Description: Use umask to make sure we create a .inf file that is
only viewable by the user. In addition, only create the temp file and
filename when necessary. In some places, the code was creating a .inf
file on disk when it could just create one in memory. The code should
check to see if the Inf object has a file associated with it before
attemtping to unlink it. Make sure we do not unlink a .inf file given
with -f on the command line. If the user specified -k, always write to
a temp file using __temp__ as the keyword to tell Inf->write to generate
a temp file.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit 8e6e74009c80a7032308657e71450cb5aed9483c)
diff --git a/ldap/admin/src/scripts/DSMigration.pm.in b/ldap/admin/src/scripts/DSMigration.pm.in
index 5070972..e406942 100644
--- a/ldap/admin/src/scripts/DSMigration.pm.in
+++ b/ldap/admin/src/scripts/DSMigration.pm.in
@@ -1105,7 +1105,7 @@ sub migrateDS {
$mig->msg($FATAL, 'error_opening_dseldif', "$oldconfigdir/dse.ldif", $!);
return 0;
}
- debug(2, "Using inffile $inf->{filename} created from $oldconfigdir\n");
+ debug(2, "Using inf created from $oldconfigdir\n");
# create servers but do not start them until after databases
# have been migrated
@@ -1113,7 +1113,9 @@ sub migrateDS {
# create the new instance
@errs = createDSInstance($inf);
- unlink($inf->{filename});
+ if ($inf->{filename}) {
+ unlink($inf->{filename});
+ }
if (@errs) {
$mig->msg(@errs);
$mig->msg($FATAL, 'error_creating_dsinstance', $inst);
diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in
index acb6991..3276497 100644
--- a/ldap/admin/src/scripts/DSUtil.pm.in
+++ b/ldap/admin/src/scripts/DSUtil.pm.in
@@ -769,30 +769,19 @@ sub createInfFromConfig {
return 0;
}
- my ($outfh, $inffile) = tempfile(SUFFIX => '.inf');
- if (!$outfh || !$inffile) {
- push @{$errs}, "error_opening_tempinf", $fname, $!;
- if ($outfh) {
- close $outfh;
- }
- $conn->close();
- return 0;
- }
- print $outfh "[General]\n";
- print $outfh "FullMachineName = ", $ent->getValues('nsslapd-localhost'), "\n";
- print $outfh "SuiteSpotUserID = ", $ent->getValues('nsslapd-localuser'), "\n";
- print $outfh "[slapd]\n";
- print $outfh "RootDN = ", $ent->getValues('nsslapd-rootdn'), "\n";
- print $outfh "RootDNPwd = ", $ent->getValues('nsslapd-rootpw'), "\n";
- print $outfh "ServerPort = ", $ent->getValues('nsslapd-port'), "\n";
- print $outfh "ServerIdentifier = $id\n";
+ my $inf = new Inf();
+ $inf->{General}->{FullMachineName} = $ent->getValues('nsslapd-localhost');
+ $inf->{General}->{SuiteSpotUserID} = $ent->getValues('nsslapd-localuser');
+ $inf->{slapd}->{RootDN} = $ent->getValues('nsslapd-rootdn');
+ $inf->{slapd}->{RootDNPwd} = $ent->getValues('nsslapd-rootpw');
+ $inf->{slapd}->{ServerPort} = $ent->getValues('nsslapd-port');
+ $inf->{slapd}->{ServerIdentifier} = $id;
my $suffix;
$ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
"one", "(objectclass=*)");
if (!$ent) {
push @{$errs}, "error_opening_dseldif", $fname, $!;
- close $outfh;
$conn->close();
return 0;
}
@@ -807,7 +796,6 @@ sub createInfFromConfig {
$ent = $conn->search("cn=config", "base", "(objectclass=*)");
if (!$ent) {
push @{$errs}, "error_opening_dseldif", $fname, $!;
- close $outfh;
$conn->close();
return 0;
}
@@ -816,12 +804,9 @@ sub createInfFromConfig {
$conn->close();
if ($inst_dir) {
- print $outfh "inst_dir = $inst_dir\n";
+ $inf->{slapd}->{inst_dir} = $inst_dir;
}
- print $outfh "Suffix = $suffix\n";
- close $outfh;
-
- my $inf = new Inf($inffile);
+ $inf->{slapd}->{Suffix} = $suffix;
return $inf;
}
diff --git a/ldap/admin/src/scripts/Inf.pm b/ldap/admin/src/scripts/Inf.pm
index bb22913..a102eb6 100644
--- a/ldap/admin/src/scripts/Inf.pm
+++ b/ldap/admin/src/scripts/Inf.pm
@@ -41,6 +41,8 @@
package Inf;
+use File::Temp qw(tempfile tempdir);
+
#require Exporter;
#@ISA = qw(Exporter);
#@EXPORT = qw();
@@ -50,6 +52,9 @@ sub new {
my $self = {};
$self->{filename} = shift;
+ $self->{writable} = shift; # do not overwrite user supplied file
+ # if you want to init an Inf with a writable file, use
+ # $inf = new Inf($filename, 1)
$self = bless $self, $type;
@@ -162,7 +167,7 @@ sub writeSection {
my $section = $self->{$name};
if (ref($section) eq 'HASH') {
print $fh "[$name]\n";
- for my $key (keys %{$section}) {
+ for my $key (sort keys %{$section}) {
if (defined($section->{$key})) {
my $val = $section->{$key};
$val =~ s/\n/\\\n/g; # make continuation lines
@@ -175,28 +180,50 @@ sub writeSection {
sub write {
my $self = shift;
my $filename = shift;
+ my $fh;
- if ($filename) {
+ return if ($filename and $filename eq "-");
+
+ # see if user wants to force use of a temp file
+ if ($filename and $filename eq '__temp__') {
+ $self->{writable} = 1;
+ $filename = '';
+ delete $self->{filename};
+ }
+
+ if (!$self->{writable}) {
+ return; # do not overwrite read only file
+ }
+
+ if ($filename) { # use user supplied filename
$self->{filename} = $filename;
- } else {
+ } elsif ($self->{filename}) { # use existing filename
$filename = $self->{filename};
+ } else { # create temp filename
+ ($fh, $self->{filename}) = tempfile("setupXXXXXX", UNLINK => 0,
+ SUFFIX => ".inf", OPEN => 1,
+ DIR => File::Spec->tmpdir);
}
- return if ($filename eq "-");
-
- if (!open(INF, ">$filename")) {
- print STDERR "Error: could not write inf file $filename: $!\n";
- return;
+ my $savemask = umask(0077);
+ if (!$fh) {
+ if (!open(INF, ">$filename")) {
+ print STDERR "Error: could not write inf file $filename: $!\n";
+ umask($savemask);
+ return;
+ }
+ $fh = *INF;
}
# write General section first
- $self->writeSection('General', \*INF);
- print INF "\n";
+ $self->writeSection('General', $fh);
+ print $fh "\n";
for my $key (keys %{$self}) {
next if ($key eq 'General');
- $self->writeSection($key, \*INF);
- print INF "\n";
+ $self->writeSection($key, $fh);
+ print $fh "\n";
}
- close INF;
+ close $fh;
+ umask($savemask);
}
sub updateFromArgs {
diff --git a/ldap/admin/src/scripts/Migration.pm.in b/ldap/admin/src/scripts/Migration.pm.in
index 1942c8b..66618c8 100644
--- a/ldap/admin/src/scripts/Migration.pm.in
+++ b/ldap/admin/src/scripts/Migration.pm.in
@@ -54,9 +54,6 @@ use Exporter ();
@EXPORT = qw();
@EXPORT_OK = qw();
-# tempfiles
-use File::Temp qw(tempfile tempdir);
-
# hostname
use Net::Domain qw(hostfqdn);
@@ -68,8 +65,6 @@ use Mozilla::LDAP::LDIF;
use Getopt::Long;
-use File::Temp qw(tempfile tempdir);
-
use SetupLog;
use DSUtil;
@@ -210,7 +205,6 @@ sub init {
$actualsroot =~ s/\/+$//; # trim trailing '/'s, if any
$self->{actualsroot} = $actualsroot || $self->{oldsroot};
$self->{silent} = $silent;
- $self->{inffile} = $inffile;
$self->{keep} = $keep;
$self->{preonly} = $preonly;
$self->{logfile} = $logfile;
@@ -218,18 +212,11 @@ sub init {
$self->{log} = new SetupLog($self->{logfile}, "migrate");
$self->{start_servers} = 1; # start servers as soon as they are migrated
# if user supplied inf file, use that to initialize
- if (defined($self->{inffile})) {
- $self->{inf} = new Inf($self->{inffile});
+ if (defined($inffile)) {
+ $self->{inf} = new Inf($inffile);
} else {
$self->{inf} = new Inf;
}
- my $fh;
- # create a temp inf file for writing for other processes
- # never overwrite the user supplied inf file
- ($fh, $self->{inffile}) = tempfile("migrateXXXXXX", UNLINK => !$keep,
- SUFFIX => ".inf", OPEN => 0,
- DIR => File::Spec->tmpdir);
- $self->{inf}->{filename} = $self->{inffile};
# see if user passed in default inf values - also, command line
# arguments override those passed in via an inf file - this
diff --git a/ldap/admin/src/scripts/Setup.pm.in b/ldap/admin/src/scripts/Setup.pm.in
index 52300db..753062d 100644
--- a/ldap/admin/src/scripts/Setup.pm.in
+++ b/ldap/admin/src/scripts/Setup.pm.in
@@ -52,9 +52,6 @@ use Exporter ();
@EXPORT = qw($SILENT $EXPRESS $TYPICAL $CUSTOM);
@EXPORT_OK = qw($SILENT $EXPRESS $TYPICAL $CUSTOM);
-# tempfiles
-use File::Temp qw(tempfile tempdir);
-
# hostname
use Net::Domain qw(hostfqdn);
@@ -66,8 +63,6 @@ use Mozilla::LDAP::LDIF;
use Getopt::Long;
-use File::Temp qw(tempfile tempdir);
-
use SetupLog;
use DSUtil;
use Inf;
@@ -141,7 +136,6 @@ sub init {
);
$self->{silent} = $silent;
- $self->{inffile} = $inffile;
$self->{keep} = $keep;
$self->{preonly} = $preonly;
$self->{update} = $update;
@@ -149,18 +143,11 @@ sub init {
$self->{logfile} = $logfile;
$self->{log} = new SetupLog($self->{logfile});
# if user supplied inf file, use that to initialize
- if (defined($self->{inffile})) {
- $self->{inf} = new Inf($self->{inffile});
+ if (defined($inffile)) {
+ $self->{inf} = new Inf($inffile);
} else {
$self->{inf} = new Inf;
}
- my $fh;
- # create a temp inf file for writing for other processes
- # never overwrite the user supplied inf file
- ($fh, $self->{inffile}) = tempfile("setupXXXXXX", UNLINK => !$keep,
- SUFFIX => ".inf", OPEN => 0,
- DIR => File::Spec->tmpdir);
- $self->{inf}->{filename} = $self->{inffile};
# see if user passed in default inf values - also, command line
# arguments override those passed in via an inf file - this
diff --git a/ldap/admin/src/scripts/migrate-ds.pl.in b/ldap/admin/src/scripts/migrate-ds.pl.in
index df14ea0..cd42800 100644
--- a/ldap/admin/src/scripts/migrate-ds.pl.in
+++ b/ldap/admin/src/scripts/migrate-ds.pl.in
@@ -68,9 +68,14 @@ $mig->msg('end_ds_migration');
$mig->doExit(0);
END {
- if ($mig) {
- if (!$mig->{keep}) {
- unlink $mig->{inffile};
- }
+ if ($mig and $mig->{keep}) {
+ $mig->{inf}->write("__temp__");
}
}
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
diff --git a/ldap/admin/src/scripts/setup-ds.pl.in b/ldap/admin/src/scripts/setup-ds.pl.in
index 266d396..7613ed8 100644
--- a/ldap/admin/src/scripts/setup-ds.pl.in
+++ b/ldap/admin/src/scripts/setup-ds.pl.in
@@ -74,7 +74,6 @@ if (!$setup->{silent}) {
if ($rc) {
$setup->doExit();
}
- $setup->{inf}->write();
}
my @errs;
@@ -105,10 +104,8 @@ if (@errs) {
$setup->doExit(0);
END {
- if ($setup) {
- if (!$setup->{keep}) {
- unlink $setup->{inffile};
- }
+ if ($setup and $setup->{keep}) {
+ $setup->{inf}->write("__temp__");
}
}
13 years, 4 months
- 1
- 0