389-commits July 2015

389-commits@lists.fedoraproject.org

3 participants
83 discussions

Branch '389-ds-base-1.3.4' - ldap/admin
by Mark Reynolds 13 Jul '15

13 Jul '15

ldap/admin/src/scripts/DSCreate.pm.in | 3 ++- ldap/admin/src/scripts/Inf.pm | 8 ++++++-- ldap/admin/src/scripts/Setup.pm.in | 3 +++ ldap/admin/src/scripts/setup-ds.res.in | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) New commits: commit eeddc9f03b6131f5c8ba715a0a05bb1280a4f9ef Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Mon Jul 13 12:24:19 2015 -0400 Ticket 48119 - Silent install needs to properly exit when INF file is missing Bug Description: If the INF file is not present, we don't log the error to the setup log file. We also don't properly check for the suitespot user, which also does not properly exit if the calling user is root. Fix Description: Properly exit if the INF file is missing, or the suitespot user is not set(and we are running the script as root). https://fedorahosted.org/389/ticket/48119 Reviewed by: rmeggins(Thanks!) (cherry picked from commit 5363898b122b1a7e7ad07fdc0ad074e91cd1510f) diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in index f44afbb..e4a4ed0 100644 --- a/ldap/admin/src/scripts/DSCreate.pm.in +++ b/ldap/admin/src/scripts/DSCreate.pm.in @@ -797,8 +797,9 @@ sub setDefaults { if (!$inf->{General}->{SuiteSpotUserID}) { if ($> != 0) { # if not root, use the user's uid $inf->{General}->{SuiteSpotUserID} = getLogin; + } else { + return('error_missing_userid'); } - # otherwise, the uid must be specified } if (!$inf->{General}->{SuiteSpotGroup}) { diff --git a/ldap/admin/src/scripts/Inf.pm b/ldap/admin/src/scripts/Inf.pm index ec433e2..d4c55f1 100644 --- a/ldap/admin/src/scripts/Inf.pm +++ b/ldap/admin/src/scripts/Inf.pm @@ -31,7 +31,9 @@ sub new { $self = bless $self, $type; if ($self->{filename}) { - $self->read(); + if($self->read() != 0){ + undef $self; + } } return $self; @@ -61,7 +63,7 @@ sub read { } else { if (!open(INF, $filename)) { debug(0, "Error: could not open inf file $filename: $!\n"); - return; + return -1; } $inffh = \*INF; } @@ -118,6 +120,8 @@ sub read { if ($inffh ne \*STDIN) { close $inffh; } + + return 0; } sub section { diff --git a/ldap/admin/src/scripts/Setup.pm.in b/ldap/admin/src/scripts/Setup.pm.in index cd49d95..99025ab 100644 --- a/ldap/admin/src/scripts/Setup.pm.in +++ b/ldap/admin/src/scripts/Setup.pm.in @@ -117,6 +117,9 @@ sub init { # if user supplied inf file, use that to initialize if (defined($inffile)) { $self->{inf} = new Inf($inffile); + if(!$self->{inf}){ + $self->doExit(1); + } } else { $self->{inf} = new Inf; } diff --git a/ldap/admin/src/scripts/setup-ds.res.in b/ldap/admin/src/scripts/setup-ds.res.in index 011bf36..7134e25 100644 --- a/ldap/admin/src/scripts/setup-ds.res.in +++ b/ldap/admin/src/scripts/setup-ds.res.in @@ -118,6 +118,7 @@ error_enabling_feature = Could not enable the directory server feature '%s'. Er error_importing_ldif = Could not import LDIF file '%s'. Error: %s. Output: %s\n error_starting_server = Could not start the directory server using command '%s'. The last line from the error log was '%s'. Error: %s\n error_stopping_server = Could not stop the directory server '%s'. Error: %s\n +error_missing_userid = The SuiteSpotUserID is missing. This must be set to valid user\n error_missing_port_and_ldapi = Either ServerPort or ldapifilepath must be specified. The server must listen to something.\n error_missing_port = No ServerPort specified. The server must have a port number to listen to (default 389).\n error_server_already_exists = Error: the server already exists at '%s'\

1 0

ldap/admin
by Mark Reynolds 13 Jul '15

13 Jul '15

ldap/admin/src/scripts/DSCreate.pm.in | 3 ++- ldap/admin/src/scripts/Inf.pm | 8 ++++++-- ldap/admin/src/scripts/Setup.pm.in | 3 +++ ldap/admin/src/scripts/setup-ds.res.in | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) New commits: commit 5363898b122b1a7e7ad07fdc0ad074e91cd1510f Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Mon Jul 13 12:24:19 2015 -0400 Ticket 48119 - Silent install needs to properly exit when INF file is missing Bug Description: If the INF file is not present, we don't log the error to the setup log file. We also don't properly check for the suitespot user, which also does not properly exit if the calling user is root. Fix Description: Properly exit if the INF file is missing, or the suitespot user is not set(and we are running the script as root). https://fedorahosted.org/389/ticket/48119 Reviewed by: rmeggins(Thanks!) diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in index f44afbb..e4a4ed0 100644 --- a/ldap/admin/src/scripts/DSCreate.pm.in +++ b/ldap/admin/src/scripts/DSCreate.pm.in @@ -797,8 +797,9 @@ sub setDefaults { if (!$inf->{General}->{SuiteSpotUserID}) { if ($> != 0) { # if not root, use the user's uid $inf->{General}->{SuiteSpotUserID} = getLogin; + } else { + return('error_missing_userid'); } - # otherwise, the uid must be specified } if (!$inf->{General}->{SuiteSpotGroup}) { diff --git a/ldap/admin/src/scripts/Inf.pm b/ldap/admin/src/scripts/Inf.pm index ec433e2..d4c55f1 100644 --- a/ldap/admin/src/scripts/Inf.pm +++ b/ldap/admin/src/scripts/Inf.pm @@ -31,7 +31,9 @@ sub new { $self = bless $self, $type; if ($self->{filename}) { - $self->read(); + if($self->read() != 0){ + undef $self; + } } return $self; @@ -61,7 +63,7 @@ sub read { } else { if (!open(INF, $filename)) { debug(0, "Error: could not open inf file $filename: $!\n"); - return; + return -1; } $inffh = \*INF; } @@ -118,6 +120,8 @@ sub read { if ($inffh ne \*STDIN) { close $inffh; } + + return 0; } sub section { diff --git a/ldap/admin/src/scripts/Setup.pm.in b/ldap/admin/src/scripts/Setup.pm.in index cd49d95..99025ab 100644 --- a/ldap/admin/src/scripts/Setup.pm.in +++ b/ldap/admin/src/scripts/Setup.pm.in @@ -117,6 +117,9 @@ sub init { # if user supplied inf file, use that to initialize if (defined($inffile)) { $self->{inf} = new Inf($inffile); + if(!$self->{inf}){ + $self->doExit(1); + } } else { $self->{inf} = new Inf; } diff --git a/ldap/admin/src/scripts/setup-ds.res.in b/ldap/admin/src/scripts/setup-ds.res.in index 011bf36..7134e25 100644 --- a/ldap/admin/src/scripts/setup-ds.res.in +++ b/ldap/admin/src/scripts/setup-ds.res.in @@ -118,6 +118,7 @@ error_enabling_feature = Could not enable the directory server feature '%s'. Er error_importing_ldif = Could not import LDIF file '%s'. Error: %s. Output: %s\n error_starting_server = Could not start the directory server using command '%s'. The last line from the error log was '%s'. Error: %s\n error_stopping_server = Could not stop the directory server '%s'. Error: %s\n +error_missing_userid = The SuiteSpotUserID is missing. This must be set to valid user\n error_missing_port_and_ldapi = Either ServerPort or ldapifilepath must be specified. The server must listen to something.\n error_missing_port = No ServerPort specified. The server must have a port number to listen to (default 389).\n error_server_already_exists = Error: the server already exists at '%s'\

1 0

Changes to 'refs/tags/389-console-1.1.12'
by Noriko Hosoi 10 Jul '15

10 Jul '15

Changes since the dawn of time: Mark Reynolds (3): Ticket 97 - 389-console should provide man page Ticket 47604 - 389-console: remove versioned jars from %{_javadir} Bump version to 1.1.8 Nathan Kinder (3): Initial import of fedora-idm-console Resolves: 183962 Resolves: 393461 Noriko Hosoi (5): Ticket 97 - 389-console should provide man page Bump version to 1.1.9 version 1.1.10 version 1.1.11 version 1.1.12 Rich Megginson (33): initial commit of Fedora Console for Windows - has no UI added UI and graphics package is not noarch support for JAVA with spaces in the pathname added license updated spec for Fedora DS 1.1 release Resolves: bug 428352 Resolves: bug 480631 Reviewed by: nkinder (Thanks!) Resolves: bug 476095 bump version to 1.1.3 to sync with CVS tag added unzip.vbs ; cleaned up/simplified Makefile update idm console version to 20090310 update for 1.1.3 fix typo in Makefile Initial commit of renaming to 389 Forgot to add provides and obsoletes for fedora-idm-console added .gitignore added need_libdir flag to control where libdir is needed to find jss fix spelling error Add 64-bit support - Use replaceable parameters for names, guids Remove old package during upgrade Remove old shortcuts must ignore All Users folders Force shortcuts to be removed - removeoldpkg must run asyncNoWait Bump version to 1.1.4 Changed version to 1.1.4.a1 make sure bitsadmin.exe path is quoted update to version 1.1.4 rc1 update to version 1.1.4 update for nspr 4.8.4, nss 3.12.6, and idm console framework 1.1.5 Bug 592120 - console for 64bit Window2008 can not be installed allow building without the script - bump version to 1.1.7 port to wix 3.0 from mozilla-build - use idm console 1.1.7

1 0

build.properties win/Console.wxs win/VERSION.mak
by Noriko Hosoi 10 Jul '15

10 Jul '15

build.properties | 2 +- win/Console.wxs | 4 ++++ win/VERSION.mak | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit a66829ef0d8fab0ad822f695c7be0205acca087d Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jul 10 16:34:44 2015 -0700 version 1.1.12 - Separate PolicyCRT from CRT in WixMerge. Note: there is not policy msm in MSVC 11 C:\Program Files (x86)\Common Files\Merge Modules diff --git a/build.properties b/build.properties index a8f5ed0..b34dc8d 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ lang=en console.root=. console.version=11 -console.dotversion=1.1.11 +console.dotversion=1.1.12 console.dotgenversion=1.1 theme.core=389-console diff --git a/win/Console.wxs b/win/Console.wxs index 885d35b..d0cf35d 100644 --- a/win/Console.wxs +++ b/win/Console.wxs @@ -303,6 +303,10 @@ <?if $(var.CRTMSM) AND ($(var.CRTMSM) != $(var.EMPTY)) ?> <Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'> <MergeRef Id='CRT' /> + </Feature> +<?endif ?> +<?if $(var.POLICYCRTMSM) AND ($(var.POLICYCRTMSM) != $(var.EMPTY)) ?> + <Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'> <MergeRef Id='PolicyCRT' /> </Feature> <?endif ?> diff --git a/win/VERSION.mak b/win/VERSION.mak index c97e041..7e58e64 100644 --- a/win/VERSION.mak +++ b/win/VERSION.mak @@ -7,7 +7,7 @@ BRANDNOSPACE=389 # this is the vendor or manufacturer VENDOR=389 Project # the version -VERSION=1.1.11 +VERSION=1.1.12 # the name of the product - this is used in the title of the # installer, in the name of the folder, and in the name # of the shortcuts

1 0

Changes to 'refs/tags/389-console-1.1.11'
by Noriko Hosoi 10 Jul '15

10 Jul '15

Changes since the dawn of time: Mark Reynolds (3): Ticket 97 - 389-console should provide man page Ticket 47604 - 389-console: remove versioned jars from %{_javadir} Bump version to 1.1.8 Nathan Kinder (3): Initial import of fedora-idm-console Resolves: 183962 Resolves: 393461 Noriko Hosoi (4): Ticket 97 - 389-console should provide man page Bump version to 1.1.9 version 1.1.10 version 1.1.11 Rich Megginson (33): initial commit of Fedora Console for Windows - has no UI added UI and graphics package is not noarch support for JAVA with spaces in the pathname added license updated spec for Fedora DS 1.1 release Resolves: bug 428352 Resolves: bug 480631 Reviewed by: nkinder (Thanks!) Resolves: bug 476095 bump version to 1.1.3 to sync with CVS tag added unzip.vbs ; cleaned up/simplified Makefile update idm console version to 20090310 update for 1.1.3 fix typo in Makefile Initial commit of renaming to 389 Forgot to add provides and obsoletes for fedora-idm-console added .gitignore added need_libdir flag to control where libdir is needed to find jss fix spelling error Add 64-bit support - Use replaceable parameters for names, guids Remove old package during upgrade Remove old shortcuts must ignore All Users folders Force shortcuts to be removed - removeoldpkg must run asyncNoWait Bump version to 1.1.4 Changed version to 1.1.4.a1 make sure bitsadmin.exe path is quoted update to version 1.1.4 rc1 update to version 1.1.4 update for nspr 4.8.4, nss 3.12.6, and idm console framework 1.1.5 Bug 592120 - console for 64bit Window2008 can not be installed allow building without the script - bump version to 1.1.7 port to wix 3.0 from mozilla-build - use idm console 1.1.7

1 0

2 commits - build.properties win/build.bat win/Console.wxs win/Makefile win/VERSION.mak
by Noriko Hosoi 10 Jul '15

10 Jul '15

build.properties | 2 +- win/Console.wxs | 6 +++--- win/Makefile | 6 +++--- win/VERSION.mak | 6 +++--- win/build.bat | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 29bc6470563ebdd306abc14f53a28f21b3c9eb14 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jul 10 14:05:10 2015 -0700 version 1.1.11 - change the nspr library name for windows (win/{Console.wxs,Makefile}). libnspr4.dll -> nspr4.dll libplds4.dll -> plds4.dll libplc4.dll -> plc4.dll - Removed unused NOMSM from win/build.bat. diff --git a/build.properties b/build.properties index 4b6529d..a8f5ed0 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ lang=en console.root=. console.version=11 -console.dotversion=1.1.10 +console.dotversion=1.1.11 console.dotgenversion=1.1 theme.core=389-console diff --git a/win/Console.wxs b/win/Console.wxs index 6ceb669..885d35b 100644 --- a/win/Console.wxs +++ b/win/Console.wxs @@ -148,15 +148,15 @@ <Directory Id='INSTALLDIR' Name='$(var.PRODUCTNAME)'> <Component Id='NSPRLibrary' Guid='DE133754-3C99-49e7-8A71-0375AB348CDD' Win64='$(var.Property_Win64)'> - <File Id='NSPR' DiskId='1' Source='libnspr4.dll' Vital='yes' /> + <File Id='NSPR' DiskId='1' Source='nspr4.dll' Vital='yes' /> </Component> <Component Id='NSPRpldsLibrary' Guid='7DCDBD30-DC5B-4c89-BD94-EE55E1D9D082' Win64='$(var.Property_Win64)'> - <File Id='NSPRPLDS' DiskId='1' Source='libplds4.dll' Vital='yes' /> + <File Id='NSPRPLDS' DiskId='1' Source='plds4.dll' Vital='yes' /> </Component> <Component Id='NSPRplcLibrary' Guid='4E707871-BA8E-41e2-982E-E3E79E85A599' Win64='$(var.Property_Win64)'> - <File Id='NSPRPLC' DiskId='1' Source='libplc4.dll' Vital='yes' /> + <File Id='NSPRPLC' DiskId='1' Source='plc4.dll' Vital='yes' /> </Component> <Component Id='NSSLibrary' Guid='3196F339-901E-42c4-AAD3-704775DCF5F4' Win64='$(var.Property_Win64)'> diff --git a/win/Makefile b/win/Makefile index d6e6379..dd994b7 100644 --- a/win/Makefile +++ b/win/Makefile @@ -154,7 +154,7 @@ $(NSPRDIR) $(NSSDIR) $(JSSDIR) $(LDAPDIR) $(IDMDIR) $(CONSOLEDIR) $(WIXDIR): $(NSPRDIR)\mdbinary.jar : $(NSPRDIR) if not exist $@ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/$(@F) %%CD%%\$@ -$(NSPRLIBDIR)\libnspr4.dll : $(NSPRDIR)\mdbinary.jar +$(NSPRLIBDIR)\nspr4.dll : $(NSPRDIR)\mdbinary.jar $(UZCMD) $? -d $(?D) $(NSSDIR)\mdbinary.jar : $(NSSDIR) @@ -184,7 +184,7 @@ $(CONSOLEDIR)\$(FILEPREF)-console_en.jar : $(CONSOLEDIR) #$(PKGDIR)\$(CANDLE) : $(WIXDIR)\wix-$(WIXVER).zip # $(UZCMD) $? -d $(?D) -LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\libnspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.dll $(JSSDIR)\jss4.jar $(LDAPDIR)\ldapjdk.jar $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar $(CONSOLEDIR)\$(FILEPREF)-console_en.jar +LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\nspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.dll $(JSSDIR)\jss4.jar $(LDAPDIR)\ldapjdk.jar $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar $(CONSOLEDIR)\$(FILEPREF)-console_en.jar copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR) copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR) copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR) diff --git a/win/VERSION.mak b/win/VERSION.mak index ab14364..c97e041 100644 --- a/win/VERSION.mak +++ b/win/VERSION.mak @@ -7,7 +7,7 @@ BRANDNOSPACE=389 # this is the vendor or manufacturer VENDOR=389 Project # the version -VERSION=1.1.10 +VERSION=1.1.11 # the name of the product - this is used in the title of the # installer, in the name of the folder, and in the name # of the shortcuts diff --git a/win/build.bat b/win/build.bat index ae425b1..d48ed7d 100644 --- a/win/build.bat +++ b/win/build.bat @@ -64,7 +64,7 @@ if not defined CRTMSM ( ) if not defined CRTMSM ( - if not defined NOMSM ( + if not defined POLICYCRTMSM ( echo ERROR: could not find the merge modules for the Visual C++ echo runtime side by side assemblies - they should be provided echo with the Visual Studio C++ and/or the Windows SDK @@ -78,4 +78,4 @@ if not defined CRTMSM ( echo Visual C++ Redistributable Package, and install it ) -nmake /nologo NOMSM=%NOMSM% CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM% +nmake /nologo CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM% commit 43e3ebcdce1f679b1e98ad881c7da0a98b6c1df2 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Wed Jun 24 12:59:25 2015 -0700 version 1.1.10 diff --git a/build.properties b/build.properties index a2ed0c1..4b6529d 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ lang=en console.root=. console.version=11 -console.dotversion=1.1.9 +console.dotversion=1.1.10 console.dotgenversion=1.1 theme.core=389-console diff --git a/win/Makefile b/win/Makefile index b0e9083..d6e6379 100644 --- a/win/Makefile +++ b/win/Makefile @@ -58,7 +58,7 @@ MSMPLAT=x86 !IF "$(APPVER)" == "6.0" WINVER=8.0 !ELSE -WINVER=5.2 +WINVER=6.1 !ENDIF !IF "$(BUILD_DEBUG)" == "optimize" diff --git a/win/VERSION.mak b/win/VERSION.mak index 8bbc1df..ab14364 100644 --- a/win/VERSION.mak +++ b/win/VERSION.mak @@ -7,18 +7,18 @@ BRANDNOSPACE=389 # this is the vendor or manufacturer VENDOR=389 Project # the version -VERSION=1.1.7 +VERSION=1.1.10 # the name of the product - this is used in the title of the # installer, in the name of the folder, and in the name # of the shortcuts PRODUCTNAME=$(BRAND) Management Console # this is the GUID of the package - must be changed # when the version is changed - use uuidgen -n1 -PKGGUID=3D26B463-9543-49F3-954E-C9AA3A76EC3A +PKGGUID=595875D5-C97E-442B-8C8C-66DD2A4583B4 # the upgrade GUID should usually not be changed UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60 # guid of old version to be removed -OLDGUID=36C8F6DB-6C1B-416e-83E4-31A0688EBD3F +OLDGUID=3D26B463-9543-49F3-954E-C9AA3A76EC3A OLDSHORTCUT=Fedora IDM Console.lnk OLDPROGRAMFOLDER=Fedora Identity Management Console # filename prefix for certain branded jar and script files

1 0

Branch '389-ds-base-1.3.4' - ldap/servers
by Noriko Hosoi 09 Jul '15

09 Jul '15

ldap/servers/plugins/replication/windows_private.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) New commits: commit 6d177bf359c022f1e46d575c6fe3ad3d97f1cfeb Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Jul 9 17:23:57 2015 -0700 Ticket #48216 - crash in ns-slapd when deleting winSyncSubtreePair from sync agreement Description: In free_subtree_pairs, the condition for stopping the loop to clean up the AD and DS subtree dn was incomplete. This patch checks the AD and DS subtree dn and if any of the pair is NULL, it stops the clean up. Related to the issue, more checks for the validation of the winSyncSubtreePair is added so that any single valued cases are ignored with an error log. [single valued case examples] winSyncSubtreePair: ou=People,dc=anytree winSyncSubtreePair: ou=People,dc=anytree: winSyncSubtreePair: :ou=People,dc=anytree https://fedorahosted.org/389/ticket/48216 Reviewed by rmeggins(a)redht.com (Thank you, Rich!!) (cherry picked from commit 6dce81e77a47dc23e0b825952c97112039f45201) diff --git a/ldap/servers/plugins/replication/windows_private.c b/ldap/servers/plugins/replication/windows_private.c index 36015c2..f5cb44e 100644 --- a/ldap/servers/plugins/replication/windows_private.c +++ b/ldap/servers/plugins/replication/windows_private.c @@ -885,7 +885,7 @@ windows_private_get_subtreepairs(const Repl_Agmt *ra) return dp->subtree_pairs; } -/* parray is NOT passed in */ +/* parray is NOT passed in; caller frees it. */ void windows_private_set_subtreepairs(const Repl_Agmt *ra, char **parray) { @@ -930,6 +930,12 @@ create_subtree_pairs(char **pairs) for (ptr = pairs; ptr && *ptr; ptr++) { p0 = ldap_utf8strtok_r(*ptr, ":", &saveptr); p1 = ldap_utf8strtok_r(NULL, ":", &saveptr); + if ((NULL == p0) || (NULL == p1)) { + LDAPDebug1Arg(LDAP_DEBUG_ANY, + "create_subtree_pairs: " + "Ignoring invalid subtree pairs \"%s\".\n", *ptr); + continue; + } spp->DSsubtree = slapi_sdn_new_dn_byval(p0); if (NULL == spp->DSsubtree) { LDAPDebug1Arg(LDAP_DEBUG_ANY, @@ -960,7 +966,11 @@ free_subtree_pairs(subtreePair **pairs) if (NULL == pairs) { return; } - for (p = *pairs; p; p++) { + /* + * If exists, the subtree pair is both non-NULL or NULL. + * Both NULL is the condition to stop the loop. + */ + for (p = *pairs; p && p->ADsubtree && p->DSsubtree; p++) { slapi_sdn_free(&(p->ADsubtree)); slapi_sdn_free(&(p->DSsubtree)); }

1 0

ldap/servers
by Noriko Hosoi 09 Jul '15

09 Jul '15

ldap/servers/plugins/replication/windows_private.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) New commits: commit 6dce81e77a47dc23e0b825952c97112039f45201 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Jul 9 17:23:57 2015 -0700 Ticket #48216 - crash in ns-slapd when deleting winSyncSubtreePair from sync agreement Description: In free_subtree_pairs, the condition for stopping the loop to clean up the AD and DS subtree dn was incomplete. This patch checks the AD and DS subtree dn and if any of the pair is NULL, it stops the clean up. Related to the issue, more checks for the validation of the winSyncSubtreePair is added so that any single valued cases are ignored with an error log. [single valued case examples] winSyncSubtreePair: ou=People,dc=anytree winSyncSubtreePair: ou=People,dc=anytree: winSyncSubtreePair: :ou=People,dc=anytree https://fedorahosted.org/389/ticket/48216 Reviewed by rmeggins(a)redht.com (Thank you, Rich!!) diff --git a/ldap/servers/plugins/replication/windows_private.c b/ldap/servers/plugins/replication/windows_private.c index 36015c2..f5cb44e 100644 --- a/ldap/servers/plugins/replication/windows_private.c +++ b/ldap/servers/plugins/replication/windows_private.c @@ -885,7 +885,7 @@ windows_private_get_subtreepairs(const Repl_Agmt *ra) return dp->subtree_pairs; } -/* parray is NOT passed in */ +/* parray is NOT passed in; caller frees it. */ void windows_private_set_subtreepairs(const Repl_Agmt *ra, char **parray) { @@ -930,6 +930,12 @@ create_subtree_pairs(char **pairs) for (ptr = pairs; ptr && *ptr; ptr++) { p0 = ldap_utf8strtok_r(*ptr, ":", &saveptr); p1 = ldap_utf8strtok_r(NULL, ":", &saveptr); + if ((NULL == p0) || (NULL == p1)) { + LDAPDebug1Arg(LDAP_DEBUG_ANY, + "create_subtree_pairs: " + "Ignoring invalid subtree pairs \"%s\".\n", *ptr); + continue; + } spp->DSsubtree = slapi_sdn_new_dn_byval(p0); if (NULL == spp->DSsubtree) { LDAPDebug1Arg(LDAP_DEBUG_ANY, @@ -960,7 +966,11 @@ free_subtree_pairs(subtreePair **pairs) if (NULL == pairs) { return; } - for (p = *pairs; p; p++) { + /* + * If exists, the subtree pair is both non-NULL or NULL. + * Both NULL is the condition to stop the loop. + */ + for (p = *pairs; p && p->ADsubtree && p->DSsubtree; p++) { slapi_sdn_free(&(p->ADsubtree)); slapi_sdn_free(&(p->DSsubtree)); }

1 0

VERSION.sh
by Noriko Hosoi 09 Jul '15

09 Jul '15

VERSION.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df6547408bcc313bc66ff67963ff8059a1bed6a2 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Jun 8 12:53:05 2015 -0700 bump version to 1.1.42 diff --git a/VERSION.sh b/VERSION.sh index 1f0d104..bf55ea2 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -11,7 +11,7 @@ vendorurl=http://port389.org # PACKAGE_VERSION is constructed from these VERSION_MAJOR=1 VERSION_MINOR=1 -VERSION_MAINT=41 +VERSION_MAINT=42 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel

1 0

Changes to 'refs/tags/389-admin-1.1.42'
by Noriko Hosoi 09 Jul '15

09 Jul '15

Changes since 389-admin-1.1.11: Endi S. Dewata (3): Bug 573889 - Migration does not remove deprecated schema Bug 644929 - FDS to 389 DS migration results in both Fedora and 389 entries Bug 470576 - Migration could do addition checks before commiting actions Ludwig (1): Ticket 47563 - cannot restart directory server from console Mark Reynolds (17): Ticket #286 - compilation fixes for 'format-security' Ticket 401 - Console login fails with anonymous access disabled Ticket 400 - BIND operation result not checked properly in admin server Ticket 47665 - Create new instance results in setting wrong ACI for the "cn=config" entry Ticket 47495 - admin express: wrong instance creation time Ticket 47497 - Admin Express - remove "Security Level" Ticket 47850 - "nsslapd-allow-anonymous-access: rootdse" makes login as "admin" fail at the first time Ticket 47300 - Update man page for remove-ds-admin.pl Ticket 47891 - Admin Server reconfig breaks SSL config Ticket 47893 - Admin Server should use Sys::Hostname instead Net::Domain Ticket 47548 - register-ds-admin does not register into remote config ds Ticket 47860 - register-ds-admin.pl problem when following steps to replicate o=netscaperoot Ticket 47697 - Resource leak in lib/libdsa/dsalib_updown.c Ticket 201 - nCipher HSM cannot be configured via the console Ticket 47929 - Admin Server - disable SSLv3 by default Ticket 47548 - register-ds-admin.pl fails to set local bind DN and password Ticket 47548 - register-ds-admin - silent file incorrectly processed Nathan Kinder (49): Bug 648949 - Merge selinux policy into base OS Regenerated autoconf files Bug 638511 - dirsrv-admin crashes at startup with SELinux enabled Bug 668950 - Add posix group support to Console Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH Bug 618897 - Wrong permissions when creating instance from Console Bug 493424 - remove unneeded modules for admin server apache config Bug 614690 - Don't use exec to call genrb Bug 699815 - (cov#10859) Add missing braces in mod_admserv code Bug 699815 - (cov#10858) getenv() called twice in viewlog cgi Bug 699815 - (cov#10849,10851) Remove unused variables Bug 699907 - (cov#10844) Uninitialized time struct Bug 699907 - (cov#10843) Use of uninitialized variable in logging code Bug 699907 - (cov#10840) Use of uninitialized buffer in security cgi Bug 699907 - (cov#10836) Use of uninitialized var in http conn code Bug 699907 - (cov#10833) Use of uninitialized vars in SNMP code Bug 700532 - (cov#10832) Incorrect if condition in dsalib Bug 700875 - (cov#10778) Cleanup ds_bring_up_server_install() in dsalib Bug 700890 - (cov#10812) Check return value of open() properly in libadmin Bug 700948 - (cov#10846) - Use of uninitialized variable in mod_admserv Bug 700948 - (cov#10845) Use of uninitialized variable in mod_admserv Bug 700948 - (cov#10839) Use of uninitialized variable in security cgi Bug 700948 - (cov#10837) Use of uninitialized variable in monreplication Bug 700948 - (cov#10835) Use of unitialized pointer in config cgi Bug 700948 - (cov#10813) dynamic overrun possibility in ds_listdb cgi Bug 700948 - (cov#10842) Use of unintialized variable in statusping Bug 700948 - (cov#10842) Use of unintialized variable in statusping Bug 702150 - (cov#10823) File descriptors leaked in help cgi Bug 702150 - (cov#10822,10821) file descriptor leaks in config cgi Bug 702150 - (cov#10820,10819) file descriptor leaks in readlog cgi Bug 702150 - leak of config array in dsalib Bug 702150 - (cov#10816) file descriptor leak in dsalib Bug 702150 - (cov#10817) Leak of string in libdsa Bug 702150 - Resouce leaks in htmladmin.c Bug 702705 - (cov#10830) NULL pointer dereference in htmladmin Bug 702705 - NULL pointer dereferences in viewlog cgi Bug 702705 - (cov#10803) NULL pointer dereference in security cgi Bug 702705 - (cov#10785) NULL pointer dereference in ds_snmpctrl Bug 702705 - (cov#10784,10783) NULL pointer dereferences in dsalib Bug 719056 - migrate-ds-admin.pl needs to update SELinux policy Bug 724808 - startup CGIs write temp file to / Bug 730079 - Update SELinux policy during upgrades Ticket #329 - Port modules to httpd 2.4 Ticket #47333 - Relabel lockfile when starting Admin Server Ticket #47334 - Avoid quoting all settings in console.conf Ticket 47468 - Change security password validation error is out of order Ticket 47466 - Importing CA cert with existing name crashes security CGI Ticket 362 - Directory Console generates insufficient key strength Ticket 47467 - Improve CRL import error messages Noriko Hosoi (37): Bug 151705 - Need to update Console Cipher Preferences with new ciphers start-ds-admin.in -- replaced "return 1" with "exit 1" Bug 616260 - libds-admin-serv linking fails due to unresolved link-time dependencies Bug 618858 - move start-ds-admin env file into main admin server Bug 387981 - plain files can be chosen on the Restore Directory dialog Bug 604881 - admin server log files have incorrect permissions/ownerships Bug 604881 - admin server log files have incorrect permissions/ownerships Bug 245278 - Changing to a password with a single quote does not work Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc) Bug 158926 - Unable to install CA certificate when using Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user Bug 476925 - Admin Server: Do not allow 8-bit passwords for Trac Ticket #307 - htmladmin keeps segfaulting If htmladmin fails to connect to the server, the cgi could crash. Ticket #293 - remove-ds-admin.pl does not remove everything Ticket #476 - 389 ds do not start on F18 due to missing modules bump version to 1.1.31 Ticket #567 - Restart of Admin server from console fails on segfault bump version to 1.1.32 bump version to 1.1.33 bump version to 1.1.34 Ticket #47493 - Configuration Tab does not work with FIPS mode enabled bump version to 1.1.36 Ticket 47891 - Admin Server reconfig breaks SSL config Ticket #47995 - Admin Server: source code cleaning bump version to 1.1.37 Ticket #48024 - repl-monitor invoked from adminserver cgi fails bump version to 1.1.38 Ticket #48153 - [adminserver] support NSS 3.18 bump version to 1.1.39 Ticket #48171 - remove-ds-admin.pl removes files in the rpm Ticket #47467 - Improve Add CRL/CKL dialog and errors bump version to 1.1.40 Ticket #48186 - register-ds-admin.pl script prints clear text password in the terminal Ticket #47493 - Configuration Tab does not work with FIPS mode enabled bump version to 1.1.41 bump version to 1.1.42 Rich Megginson (66): bump version to 1.1.12.a1 initial support for openldap add selinux policy for dsgw skip LD_PRELOAD if using openldap add more log information if nss init fails add even more nss debugging Bug 618454 - mod_admserv should only clear NSS caches and shutdown if NSS is initialized bump version to 1.1.12.a2 fix building with mozldap bump version to 1.1.12.a3 fix autotool build issues with properties files setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error Bug 656441 - Missing library path entry causes LD_PRELOAD error bump version to 1.1.13 bump version to 1.1.14.a1 Bug 664671 - Admin server segfault when full SSL access (http+ldap+console) required bump version to 1.1.14 bump version to 1.1.15 bump version to 1.1.16 Bug 703990 - Support upgrade from Red Hat Directory Server bump version to 1.1.17 add support for different skins skip rebranding current brand bump version to 1.1.18 look for separate openldap ldif library bump version to 1.1.19 Bug 710372 - Not able to open the Manage Certificate from DS-console better NSS error handling - reduce memory leaks fix typo in NSS_Shutdown warning message added tests for the security cgi Bug 713000 - Migration stops if old admin server cannot be stopped Bug 718079 - Perl errors when running migrate-ds-admin.pl Bug 718285 - AdminServer should use "service" command instead of start/stop/restart scripts bump version to 1.1.20 bump version to 1.1.21 handle binary upgrade add man pages for ds_removal and ds_unregister bump version to 1.1.22 fix binary paths bump version to 1.1.23 bump version to 1.1.24 Bug 695741 - Providing native systemd file for upcoming F16 Feature Systemd Bug 740959 - 389-console put CA certificates into wrong database bump version to 1.1.25 Bug 767823 - selinux: need to allow admin server to connect to ldap port bump version to 1.1.26 Ticket #161 - Review and address latest Coverity issues Ticket #281 - TLS not working with latest openldap bump version to 1.1.27 bump version to 1.1.28 bump version to 1.1.29 bump version to 1.1.30 ignore files generated by Eclipse Ticket #47486 compiler warnings in adminutil, admin, dsgw Ticket #47465 problem with 389-adminutil detection in m4/adminutil.m4 in 389-admin and 389-dsgw add more debugging for SSL connection problems Ticket #47413 389-admin fails to build with latest httpd compiler warning - ldif_read_record lineno type depends on openldap version add Eclipse and patch files bump version to 1.1.35 Ticket #47498 Error Message for Failed to create the configuration directory server Ticket #418 Error with register-ds-admin.pl Ticket #222 Admin Express issues "Internal Server Error" when the Config DS is down. Ticket #434 admin-serv logs filling with "admserv_host_ip_check: ap_get_remote_host could not resolve <ip address>" Ticket #47300 [RFE] remove-ds-admin.pl: redesign the behaviour Ticket #47478 No groups file? error restarting Admin server Wes Hardin (1): fix for bug 377 - Unchecked use of SELinux command noriko (1): Ticket #47298 - remove-ds-admin.pl does not stop the admin server --- .gitignore | 4 Makefile.am | 109 Makefile.in | 1767 - VERSION.sh | 4 aclocal.m4 | 7258 ---- admserv/cfgstuff/console.conf.in | 2 admserv/cfgstuff/httpd-2.2.conf.in | 13 admserv/cfgstuff/httpd-2.4.conf.in | 742 admserv/cfgstuff/httpd.conf.in | 2 admserv/cfgstuff/initconfig.in | 5 admserv/cfgstuff/start-ds-admin.in | 83 admserv/cgi-ds/ds_listdb.c | 26 admserv/cgi-ds/ds_snmpctrl.c | 5 admserv/cgi-src40/ReadLog.c | 18 admserv/cgi-src40/admlib.mk | 119 admserv/cgi-src40/admpw.c | 79 admserv/cgi-src40/cgicommon.h | 1 admserv/cgi-src40/cgicommon.properties | 3 admserv/cgi-src40/config.c | 47 admserv/cgi-src40/dllglue.c | 42 admserv/cgi-src40/ds_create.in | 18 admserv/cgi-src40/dsconfig.c | 10 admserv/cgi-src40/head.html | 1 admserv/cgi-src40/help.c | 15 admserv/cgi-src40/htmladmin.c | 810 admserv/cgi-src40/htmladmin.properties | 42 admserv/cgi-src40/monreplication.c | 7 admserv/cgi-src40/repl-monitor-cgi.pl.in | 30 admserv/cgi-src40/restartsrv.c | 9 admserv/cgi-src40/sec-activate.c | 163 admserv/cgi-src40/security.c | 348 admserv/cgi-src40/security.properties | 8 admserv/cgi-src40/start_config_ds.c | 11 admserv/cgi-src40/statpingserv.c | 82 admserv/cgi-src40/stopsrv.c | 10 admserv/cgi-src40/ugdsconfig.c | 39 admserv/cgi-src40/viewdata.c | 264 admserv/cgi-src40/viewdata.properties | 2 admserv/cgi-src40/viewlog.c | 75 admserv/cgi-src40/viewlog.properties | 6 admserv/genrb_wrapper.sh | 2 admserv/html/admserv.html.in | 11 admserv/html/htmladmin.html.in | 13 admserv/html/monreplication.html | 20 admserv/html/viewdata.html | 6 admserv/html/viewlog.html | 14 admserv/makeUpgradeTar.sh | 30 admserv/newinst/src/25changefedorato389.pl | 250 admserv/newinst/src/25rebrand.pl.in | 413 admserv/newinst/src/30updateglobalpref.pl.in | 9 admserv/newinst/src/AdminMigration.pm.in | 79 admserv/newinst/src/AdminServer.pm.in | 270 admserv/newinst/src/AdminUtil.pm.in | 91 admserv/newinst/src/ConfigDSDialogs.pm | 42 admserv/newinst/src/dirserver.map.in | 1 admserv/newinst/src/register-ds-admin.pl.in | 719 admserv/newinst/src/register-ds-admin.res.in | 38 admserv/newinst/src/register_param.map.in | 4 admserv/newinst/src/register_server.pl.in | 6 admserv/newinst/src/remove-ds-admin.pl.in | 8 admserv/newinst/src/setup-ds-admin.pl.in | 6 admserv/newinst/src/setup-ds-admin.res.in | 20 admserv/schema/ldif/02globalpreferences.ldif.tmpl | 49 admserv/schema/ldif/10dsdata.ldif.tmpl | 39 compile | 240 config.guess | 529 config.h.in | 33 config.sub | 379 configure |38698 +++++++++------------- configure.ac | 111 depcomp | 343 include/base/file.h | 3 include/base/util.h | 3 include/libadmin/dbtlibadmin.h | 2 include/libadmin/libadmin.h | 92 include/libdsa/dsalib.h | 15 install-sh | 538 lib/base/file.cpp | 30 lib/base/nscputil.cpp | 51 lib/libadmin/dllglue.c | 77 lib/libadmin/httpcon.c | 5 lib/libadmin/referer.c | 4 lib/libadmin/template.c | 29 lib/libadmin/util.c | 973 lib/libdsa/dsalib_conf.c | 37 lib/libdsa/dsalib_confs.c | 93 lib/libdsa/dsalib_location.c | 56 lib/libdsa/dsalib_tailf.c | 1 lib/libdsa/dsalib_updown.c | 118 lib/libdsa/dsalib_util.c | 56 ltmain.sh |14878 +++++--- m4/adminutil.m4 | 4 m4/httpd.m4 | 3 m4/mozldap.m4 | 116 m4/openldap.m4 | 138 m4/selinux.m4 | 3 man/man8/ds_removal.8 | 54 man/man8/ds_unregister.8 | 48 man/man8/register-ds-admin.pl.8 | 139 man/man8/remove-ds-admin.pl.8 | 10 man/man8/restart-ds-admin.8 | 10 man/man8/start-ds-admin.8 | 10 man/man8/stop-ds-admin.8 | 10 missing | 234 mod_admserv/mod_admserv.c | 564 mod_admserv/mod_admserv.h | 15 mod_restartd/mod_restartd-2.2.c | 22 selinux/dirsrv-admin.fc.in | 5 selinux/dirsrv-admin.te | 2 tests/ds_create/testget.1 | 2 tests/htmladmin/testget.2 | 2 tests/htmladmin/testget.3 | 2 tests/htmladmin/testget.4 | 2 tests/htmladmin/testget.5 | 2 tests/htmladmin/testget.6 | 2 tests/htmladmin/testget.7 | 2 tests/htmladmin/testget.8 | 2 tests/security/testpost.1 | 1 tests/security/testpost.10 | 1 tests/security/testpost.11 | 1 tests/security/testpost.12 | 1 tests/security/testpost.13 | 1 tests/security/testpost.14 | 1 tests/security/testpost.15 | 1 tests/security/testpost.16 | 1 tests/security/testpost.17 | 1 tests/security/testpost.18 | 1 tests/security/testpost.19 | 1 tests/security/testpost.2 | 1 tests/security/testpost.20 | 1 tests/security/testpost.21 | 1 tests/security/testpost.3 | 1 tests/security/testpost.4 | 1 tests/security/testpost.5 | 1 tests/security/testpost.6 | 1 tests/security/testpost.7 | 1 tests/security/testpost.8 | 1 tests/security/testpost.9 | 1 tests/setup.sh | 250 tests/ugdsconfig/testget.10 | 2 tests/viewdata/testget.2 | 2 tests/viewdata/testget.3 | 2 tests/viewdata/testget.4 | 2 tests/viewlog/testget.3 | 2 tests/viewlog/testget.4 | 2 wrappers/initscript.in | 3 wrappers/systemd.service.in | 24 147 files changed, 35311 insertions(+), 38215 deletions(-) ---

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits July 2015