[Fedora-directory-commits] esc/src/app/xpcom/tray rhLinuxTray.cpp, 1.7, 1.8
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10822/app/xpcom/tray
Modified Files:
rhLinuxTray.cpp
Log Message:
Minor Linux build fixes.
Index: rhLinuxTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhLinuxTray.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rhLinuxTray.cpp 4 Feb 2009 01:43:46 -0000 1.7
+++ rhLinuxTray.cpp 17 Apr 2009 00:11:11 -0000 1.8
@@ -23,6 +23,7 @@
#include "notifytray.h"
#include "intl/nsIStringBundle.h"
#include <gdk/gdkx.h>
+#include <stdlib.h>
NS_IMPL_ISUPPORTS1(rhTray, rhITray)
15 years
[Fedora-directory-commits] esc/src/app/xpcom Makefile.sdk,1.2,1.3
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10822/app/xpcom
Modified Files:
Makefile.sdk
Log Message:
Minor Linux build fixes.
Index: Makefile.sdk
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.sdk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.sdk 4 Feb 2009 02:38:07 -0000 1.2
+++ Makefile.sdk 17 Apr 2009 00:11:11 -0000 1.3
@@ -178,8 +178,8 @@
install::
ifdef DESTDIR
- cp -rf $(DEPLOY_OBJDIR)/esc/* $(DESTDIR)
- cp -f $(CORE_DIST)/bin/escd $(DESTDIR)
+ cp -rf $(DEPLOY_OBJDIR)/esc/* $(DESTDIR)
+ cp -f $(CORE_DIST)/bin/escd $(DESTDIR)
endif
@@ -204,8 +204,8 @@
$(CXX) $(CPPFLAGS) -c -o $(OBJECT) $(GECKO_CONFIG_INCLUDE) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(COOL_INCLUDES) $(CXXFLAGS) $(FILES)
$(CXX) $(CPPFLAGS) -shared -o $(TARGET) $(OBJECT) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(GECKO_LDFLAGS) $(COOL_LDFLAGS)
- chmod +x $(TARGET)
- strip $(TARGET)
+ chmod +x $(TARGET)
+ strip $(TARGET)
endif
ifeq ($(OS_ARCH),WINNT)
15 years
[Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.28, 1.29
by Noriko Hosoi
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21668
Modified Files:
log.c
Log Message:
Resolves: #475338
Summary: LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer (comment #20)
Description: In log_reverse_convert_time, by initializing "struct tm" with
NULLs:
struct tm tm = {0};
tm_isdst is also set to 0, which means no daylight saving. mktime thinks when
converting struct tm to time_t, use the knowledge "the time that the time_t
represents is not in the daylight saving period". Instead, we should have set
"tm.tm_isdst = -1;". That means, we don't have the knowledge, calculate it in
mktime.
I also fixed a silly bug in generating a rotated log file name which I
introduced in my previous checkin.
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- log.c 16 Apr 2009 17:03:13 -0000 1.28
+++ log.c 16 Apr 2009 20:11:12 -0000 1.29
@@ -2598,7 +2598,7 @@
logp->l_ctime = log_reverse_convert_time(p);
PR_snprintf(rotated_log, rotated_log_len, "%s/%s",
- dirptr, dirent->name);
+ logsdir, dirent->name);
switch (log_type_id) {
case ERRORSLOG:
logp->l_size = log__getfilesize_with_filename(rotated_log);
@@ -4069,20 +4069,16 @@
log_reverse_convert_time(char *tbuf)
{
struct tm tm = {0};
- time_t converted = 0;
if (strchr(tbuf, '-')) { /* short format */
strptime(tbuf, "%Y%m%d-%H%M%S", &tm);
- /* tm returned from strptime is one hour (3600 sec) advanced if
- * short format is used. Adjusting it to the original string.
- */
- converted = mktime(&tm) - 3600;
} else if (strchr(tbuf, '/') && strchr(tbuf, ':')) { /* long format */
strptime(tbuf, "%d/%b/%Y:%H:%M:%S", &tm);
- converted = mktime(&tm);
+ } else {
+ return 0;
}
-
- return converted;
+ tm.tm_isdst = -1;
+ return mktime(&tm);
}
int
15 years
[Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.27, 1.28
by Noriko Hosoi
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2949
Modified Files:
log.c
Log Message:
Resolves: #475338
Summary: LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer (comment #20)
Description:
1) replaced PR_GetOpenFileInfo with PR_GetOpenFileInfo64 in log_getfilesize.
PR_GetOpenFileInfo does not return the correct file size if the size is
larger than 2GB.
2) when a rotation info file is missing and recreated, the file size stored
in the file was not correct.
3) rotated file name is created with the time stamp when rotated. The reverse
conversion function had a problem and the file name in the rotation info and
the real one could mismatch.
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- log.c 13 Mar 2009 20:35:37 -0000 1.27
+++ log.c 16 Apr 2009 17:03:13 -0000 1.28
@@ -124,6 +124,7 @@
static int log__extract_logheader (FILE *fp, long *f_ctime, PRInt64 *f_size);
static int log__check_prevlogs (FILE *fp, char *filename);
static PRInt64 log__getfilesize(LOGFD fp);
+static PRInt64 log__getfilesize_with_filename(char *filename);
static int log__enough_freespace(char *path);
static int vslapd_log_error(LOGFD fp, char *subsystem, char *fmt, va_list ap, int locked );
@@ -2515,6 +2516,8 @@
int log_type_id;
int rval = LOG_ERROR;
char *p;
+ char *rotated_log = NULL;
+ int rotated_log_len = 0;
/* rotation info file is broken; can't trust the contents */
time (&now);
@@ -2557,6 +2560,10 @@
loginfo.log_audit_logchain = NULL;
break;
}
+ /* length of (pathname + .YYYYMMDD-hhmmss)
+ * pathname includes ".rotationinfo", but that's fine. */
+ rotated_log_len = strlen(pathname) + 17;
+ rotated_log = (char *)slapi_ch_malloc(rotated_log_len);
/* read the directory entries into a linked list */
for (dirent = PR_ReadDir(dirptr, dirflags); dirent ;
dirent = PR_ReadDir(dirptr, dirflags)) {
@@ -2589,21 +2596,24 @@
logp = (struct logfileinfo *) slapi_ch_malloc (sizeof (struct logfileinfo));
logp->l_ctime = log_reverse_convert_time(p);
+
+ PR_snprintf(rotated_log, rotated_log_len, "%s/%s",
+ dirptr, dirent->name);
switch (log_type_id) {
case ERRORSLOG:
- logp->l_size = loginfo.log_error_maxlogsize; /* dummy */
+ logp->l_size = log__getfilesize_with_filename(rotated_log);
logp->l_next = loginfo.log_error_logchain;
loginfo.log_error_logchain = logp;
loginfo.log_numof_error_logs++;
break;
case ACCESSLOG:
- logp->l_size = loginfo.log_access_maxlogsize;
+ logp->l_size = log__getfilesize_with_filename(rotated_log);
logp->l_next = loginfo.log_access_logchain;
loginfo.log_access_logchain = logp;
loginfo.log_numof_access_logs++;
break;
case AUDITLOG:
- logp->l_size =loginfo.log_audit_maxlogsize;
+ logp->l_size = log__getfilesize_with_filename(rotated_log);
logp->l_next = loginfo.log_audit_logchain;
loginfo.log_audit_logchain = logp;
loginfo.log_numof_audit_logs++;
@@ -2616,6 +2626,7 @@
if (NULL != dirptr)
PR_CloseDir(dirptr);
slapi_ch_free_string(&logsdir);
+ slapi_ch_free_string(&rotated_log);
return rval;
}
#undef ERRORSLOG
@@ -2890,12 +2901,23 @@
static PRInt64
log__getfilesize(LOGFD fp)
{
- PRFileInfo info;
+ PRFileInfo64 info;
- if (PR_GetOpenFileInfo (fp, &info) == PR_FAILURE) {
+ if (PR_GetOpenFileInfo64 (fp, &info) == PR_FAILURE) {
return -1;
}
- return (PRInt64)info.size; /* type of size is off_t */
+ return (PRInt64)info.size; /* type of size is PROffset64 */
+}
+
+static PRInt64
+log__getfilesize_with_filename(char *filename)
+{
+ PRFileInfo64 info;
+
+ if (PR_GetFileInfo64 ((const char *)filename, &info) == PR_FAILURE) {
+ return -1;
+ }
+ return (PRInt64)info.size; /* type of size is PROffset64 */
}
#endif
@@ -4047,16 +4069,20 @@
log_reverse_convert_time(char *tbuf)
{
struct tm tm = {0};
+ time_t converted = 0;
if (strchr(tbuf, '-')) { /* short format */
strptime(tbuf, "%Y%m%d-%H%M%S", &tm);
+ /* tm returned from strptime is one hour (3600 sec) advanced if
+ * short format is used. Adjusting it to the original string.
+ */
+ converted = mktime(&tm) - 3600;
} else if (strchr(tbuf, '/') && strchr(tbuf, ':')) { /* long format */
strptime(tbuf, "%d/%b/%Y:%H:%M:%S", &tm);
- } else {
- return 0;
+ converted = mktime(&tm);
}
- return mktime(&tm);
+ return converted;
}
int
15 years
[Fedora-directory-commits] esc/win32 setup.iss,1.8,1.9
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21283
Modified Files:
setup.iss
Log Message:
More minor edits.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- setup.iss 15 Apr 2009 21:02:11 -0000 1.8
+++ setup.iss 15 Apr 2009 21:47:32 -0000 1.9
@@ -5,19 +5,20 @@
AppName=Smart Card Manager
AppMutex=ESCMutex
AppVerName=Smart Card Manager 1.1.0-4
-AppPublisher=Red Hat, Inc.
+AppPublisher=Fedora
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
OutputBaseFilename=SmartCardManagerSetup-1.1.0-4.win32.i386
-DefaultDirName={pf}\Red Hat\ESC
+DefaultDirName={pf}\Fedora\ESC
DisableProgramGroupPage=false
-DefaultGroupName=Red Hat
+DefaultGroupName=Fedora
SetupIconFile=BUILD\ESC\components\esc.ico
UninstallDisplayIcon={app}\components\esc.ico
-WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
+;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
+WizardImageFile=esc-image-large.bmp
WizardSmallImageFile=BUILD\ESC\components\esc.bmp
AllowNoIcons=yes
LicenseFile=esc-license.txt
15 years
[Fedora-directory-commits] esc/win32 setup.iss,1.7,1.8
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10121
Modified Files:
setup.iss
Log Message:
Minor typo.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup.iss 15 Apr 2009 01:35:07 -0000 1.7
+++ setup.iss 15 Apr 2009 21:02:11 -0000 1.8
@@ -459,7 +459,7 @@
; Now register the Safenet 330J
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypt Provider; ValueData: CoolKey PKCS #11 CSP
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00
15 years
[Fedora-directory-commits] esc/win32 setup.iss,1.6,1.7
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27812
Modified Files:
setup.iss
Log Message:
Fix for #495765, add smart card login reg entries for the 330J.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setup.iss 30 Mar 2009 22:05:41 -0000 1.6
+++ setup.iss 15 Apr 2009 01:35:07 -0000 1.7
@@ -4,14 +4,14 @@
[Setup]
AppName=Smart Card Manager
AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.1.0-3
+AppVerName=Smart Card Manager 1.1.0-4
AppPublisher=Red Hat, Inc.
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
-OutputBaseFilename=SmartCardManagerSetup-1.1.0-3.win32.i386
+OutputBaseFilename=SmartCardManagerSetup-1.1.0-4.win32.i386
DefaultDirName={pf}\Red Hat\ESC
DisableProgramGroupPage=false
DefaultGroupName=Red Hat
@@ -24,7 +24,7 @@
InfoBeforeFile=info-before.txt
InfoAfterFile=info-after.txt
PrivilegesRequired=admin
-VersionInfoVersion=1.1.0.3
+VersionInfoVersion=1.1.0.4
[Files]
@@ -450,12 +450,18 @@
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
; Now register the Gemalto 64K V2
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask: ValueData: ff ff ff ff ff ff ff ff ff ff; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask; ValueData: ff ff 00 ff 00 ff ff ff 00 00; Flags: uninsdeletekey
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: binary; ValueName: ATR; ValueData: 3b 95 95 40 ff ae 01 03 00 00
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATR; ValueData: 3b 95 00 40 00 ae 01 03 00 00
+; Now register the Safenet 330J
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypt Provider; ValueData: CoolKey PKCS #11 CSP
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00
Root: HKLM; Subkey: Software\
; Turn off the "pick a cert" dialog box
15 years
[Fedora-directory-commits] adminserver/pkg fedora-ds-admin.spec, 1.6, 1.7
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/pkg
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10751/adminserver/pkg
Modified Files:
fedora-ds-admin.spec
Log Message:
bump version for bug fix
Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/dirsec/adminserver/pkg/fedora-ds-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin.spec 3 Apr 2009 16:10:23 -0000 1.6
+++ fedora-ds-admin.spec 9 Apr 2009 01:05:39 -0000 1.7
@@ -4,7 +4,7 @@
Summary: Fedora Administration Server (admin)
Name: fedora-ds-admin
Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: http://directory.fedoraproject.org/
Group: System Environment/Daemons
@@ -147,6 +147,11 @@
%{_mandir}/man8/*
%changelog
+* Wed Apr 8 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.1.7-3
+- Resolves: bug 494980
+- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408
+
* Fri Apr 3 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.1.7-2
- Resolves: bug 493989
- Description: Admin Server: valgrind invalid read in security.c when installing CRL
15 years
[Fedora-directory-commits] adminserver/admserv/newinst/src AdminServer.pm.in, 1.16, 1.17 setup-ds-admin.pl.in, 1.14, 1.15
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10013/adminserver/admserv/newinst/src
Modified Files:
AdminServer.pm.in setup-ds-admin.pl.in
Log Message:
Resolves: bug 494980
Bug Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress
Reviewed by: nkinder (Thanks!)
Fix Description: We were only setting the default ServerIpAddress in the regular interactive mode, not in -u or silent mode. In addition, I found several other parameters that had the same problem. I borrowed code from the interactive mode code to set the default values.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AdminServer.pm.in 27 Feb 2009 14:33:27 -0000 1.16
+++ AdminServer.pm.in 8 Apr 2009 22:47:43 -0000 1.17
@@ -21,10 +21,10 @@
@ISA = qw(Exporter);
@EXPORT = qw(createAdminServer reconfigAdminServer
createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
- startAdminServer removeAdminServer);
+ startAdminServer removeAdminServer setDefaults);
@EXPORT_OK = qw(createAdminServer reconfigAdminServer
createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
- startAdminServer removeAdminServer);
+ startAdminServer removeAdminServer setDefaults);
use File::Path;
# tempfiles
@@ -41,16 +41,51 @@
use Setup;
use AdminUtil;
+sub setDefaults {
+ my $setup = shift;
+
+ if (!defined($setup->{inf}->{admin}->{ServerIpAddress})) {
+ $setup->{inf}->{admin}->{ServerIpAddress} = '@admservip@';
+ }
+ if (!defined($setup->{inf}->{admin}->{Port})) {
+ $setup->{inf}->{admin}->{Port} = @admservport@;
+ }
+ if (!defined($setup->{inf}->{admin}->{SysUser})) {
+ my $user = $setup->{inf}->{General}->{SuiteSpotUserID};
+ if (!defined($user)) {
+ if ($> == 0) { # if root, use the default user
+ $user = "@httpduser@";
+ } else { # if not root, use the user's uid
+ $user = getLogin;
+ }
+ }
+ $setup->{inf}->{admin}->{SysUser} = $user;
+ }
+ if (!defined($setup->{inf}->{admin}->{ServerAdminID})) {
+ my $id = $setup->{inf}->{General}->{ConfigDirectoryAdminID};
+ if (isValidDN($id)) {
+ $id =~ s/^(.*)=.*/$1/;
+ }
+ $setup->{inf}->{admin}->{ServerAdminID} = $id;
+ }
+ if (!defined($setup->{inf}->{admin}->{ServerAdminPwd})) {
+ my $pwd = $setup->{inf}->{General}->{ConfigDirectoryAdminPwd};
+ $setup->{inf}->{admin}->{ServerAdminPwd} = $pwd;
+ }
+
+ return 1;
+}
+
sub checkRequiredParameters {
my $setup = shift;
- for my $asparam (qw(Port SysUser ServerAdminID ServerAdminPwd)) {
+ for my $asparam (qw(ServerIpAddress Port SysUser ServerAdminID ServerAdminPwd)) {
if (!defined($setup->{inf}->{admin}->{$asparam})) {
$setup->msg($FATAL, "missing_adminserver_param", $asparam);
return 0;
}
}
- for my $general (qw(SuiteSpotUserID SuiteSpotGroup ConfigDirectoryLdapURL)) {
+ for my $general (qw(AdminDomain SuiteSpotUserID SuiteSpotGroup ConfigDirectoryLdapURL)) {
if (!defined($setup->{inf}->{General}->{$general})) {
$setup->msg($FATAL, "missing_general_param", $general);
return 0;
@@ -434,6 +469,10 @@
$setup->msg('begin_create_adminserver');
}
+ if (!setDefaults($setup)) {
+ return 0;
+ }
+
if (!checkRequiredParameters($setup)) {
return 0;
}
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- setup-ds-admin.pl.in 27 Feb 2009 14:33:27 -0000 1.14
+++ setup-ds-admin.pl.in 8 Apr 2009 22:47:43 -0000 1.15
@@ -30,6 +30,7 @@
use AdminUtil;
use AdminServer;
use Util;
+use Net::Domain qw(hostfqdn);
my $res = new Resource("@propertydir(a)/setup-ds.res",
"@propertydir(a)/setup-ds-admin.res");
@@ -93,6 +94,14 @@
$setup->{inf}->{slapd}->{SlapdConfigForMC} = 0;
}
$setup->{reconfigas} = 1; # allow AS reconfig
+} else {
+ # default to creating the config DS
+ unless (defined($setup->{inf}->{slapd}->{UseExistingMC})) {
+ $setup->{inf}->{slapd}->{UseExistingMC} = 0;
+ }
+ unless (defined($setup->{inf}->{slapd}->{SlapdConfigForMC})) {
+ $setup->{inf}->{slapd}->{SlapdConfigForMC} = "yes";
+ }
}
# do not allow reconfig (setup -r) if no setup has been done
@@ -145,6 +154,7 @@
}
}
+# set default values
my $createconfigds;
if ((defined($setup->{inf}->{slapd}->{SlapdConfigForMC}) and
("yes" =~ /^$setup->{inf}->{slapd}->{SlapdConfigForMC}/i)) or
@@ -159,6 +169,24 @@
$createconfigds = 1;
}
+if (!defined($setup->{inf}->{General}->{ConfigDirectoryAdminID})) {
+ $setup->{inf}->{General}->{ConfigDirectoryAdminID} = "admin";
+}
+
+if (!defined($setup->{inf}->{General}->{AdminDomain})) {
+ my $admindomain = $setup->{inf}->{General}->{FullMachineName} ||
+ hostfqdn;
+ $admindomain =~ s/^[^\.]*\.//; # just the domain part
+ $setup->{inf}->{General}->{AdminDomain} = $admindomain;
+}
+
+if (!defined($setup->{inf}->{General}->{SuiteSpotGroup})) {
+ $setup->{inf}->{General}->{SuiteSpotGroup} = "@httpdgroup@";
+}
+
+# for admin server too, since ServerAdminID is used by AdminUtil code
+AdminServer::setDefaults($setup);
+
$setup->{inf}->write();
my @errs;
15 years
[Fedora-directory-commits] ldapserver/ldap/servers/slapd slapi_counter.c, 1.7, 1.8
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31169
Modified Files:
slapi_counter.c
Log Message:
re-enable ppc support
NOTE: We do not have support for atomic 64-bit counters on ppc - ppc platorms use the mutex approach instead
Index: slapi_counter.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi_counter.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slapi_counter.c 21 Nov 2008 17:06:05 -0000 1.7
+++ slapi_counter.c 6 Apr 2009 18:11:18 -0000 1.8
@@ -53,6 +53,7 @@
#endif
#endif
+#ifdef ATOMIC_64BIT_OPERATIONS
#if defined LINUX && (defined CPU_x86 || !HAVE_DECL___SYNC_ADD_AND_FETCH)
/* On systems that don't have the 64-bit GCC atomic builtins, we need to
* implement our own atomic functions using inline assembly code. */
@@ -69,6 +70,8 @@
#define __sync_add_and_fetch __sync_add_and_fetch_8
#define __sync_sub_and_fetch __sync_sub_and_fetch_8
#endif
+#endif /* ATOMIC_64BIT_OPERATIONS */
+
/*
* Counter Structure
@@ -428,6 +431,7 @@
return value;
}
+#ifdef ATOMIC_64BIT_OPERATIONS
#if defined LINUX && (defined CPU_x86 || !HAVE_DECL___SYNC_ADD_AND_FETCH)
/* On systems that don't have the 64-bit GCC atomic builtins, we need to
* implement our own atomic add and subtract functions using inline
@@ -520,3 +524,4 @@
return retval;
}
#endif /* LINUX && (defined CPU_x86 || !HAVE_DECL___SYNC_ADD_AND_FETCH) */
+#endif /* ATOMIC_64BIT_OPERATIONS */
15 years