[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.9, 1.10
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3949
Modified Files:
PassSync.wxs
Log Message:
170328 - Fixed modify type installation so it actually updates the registry
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PassSync.wxs 11 Oct 2005 15:40:40 -0000 1.9
+++ PassSync.wxs 12 Oct 2005 18:37:35 -0000 1.10
@@ -47,6 +47,30 @@
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
<Property Id='DiskPrompt' Value="Password Sync Installation [1]" />
+ <Property Id="HOSTNAME">
+ <RegistrySearch Id="HostName" Root="HKLM" Key="Software\PasswordSync"
+ Name="Host Name" Type="registry" />
+ </Property>
+ <Property Id="PORTNUM">
+ <RegistrySearch Id="PortNum" Root="HKLM" Key="Software\PasswordSync"
+ Name="Port Number" Type="registry" />
+ </Property>
+ <Property Id="USER">
+ <RegistrySearch Id="UserName" Root="HKLM" Key="Software\PasswordSync"
+ Name="User Name" Type="registry" />
+ </Property>
+ <Property Id="PASSWORD">
+ <RegistrySearch Id="Password" Root="HKLM" Key="Software\PasswordSync"
+ Name="Password" Type="registry" />
+ </Property>
+ <Property Id="CERTTOKEN">
+ <RegistrySearch Id="Certtkn" Root="HKLM" Key="Software\PasswordSync"
+ Name="Cert Token" Type="registry" />
+ </Property>
+ <Property Id="SRCHBASE">
+ <RegistrySearch Id="SrchBase" Root="HKLM" Key="Software\PasswordSync"
+ Name="Search Base" Type="registry" />
+ </Property>
<Directory Id='TARGETDIR' Name='SourceDir'>
@@ -124,6 +148,7 @@
<Registry Id='SrchBase' Root='HKLM' Key='Software\PasswordSync' Name='Search Base' Action='write' Type='string' Value='[SRCHBASE]' />
<Registry Id='UserFld' Root='HKLM' Key='Software\PasswordSync' Name='User Name Field' Action='write' Type='string' Value='ntuserdomainid' />
<Registry Id='PassFld' Root='HKLM' Key='Software\PasswordSync' Name='Password Field' Action='write' Type='string' Value='userpassword' />
+ <Registry Id='LogLevel' Root='HKLM' Key='Software\PasswordSync' Name='Log Level' Action='write' Type='string' Value='0' />
<Registry Id='NotPkgs' Root='HKLM' Key='SYSTEM\ControlSet001\Control\Lsa' Name='Notification Packages' Action='append'
Type='multiString' Value='passhook'/>
@@ -814,6 +839,7 @@
<Dialog Id="VerifyReadyDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes" TrackDiskSpace="yes">
<Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Install]">
+ <Publish Event="Reinstall" Value="ALL"><![CDATA[InstallMode = "Change"]]></Publish>
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/passsync dssynch.h, 1.5, 1.5.2.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/synctools/passwordsync/passsync
Modified Files:
Tag: Directory71RtmBranch
dssynch.h
Log Message:
170321 - Increase winsync version to 1.0.1
Index: dssynch.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/dssynch.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- dssynch.h 19 Apr 2005 22:07:44 -0000 1.5
+++ dssynch.h 11 Oct 2005 15:56:01 -0000 1.5.2.1
@@ -65,6 +65,6 @@
#define DS_SERVICE_NAME_UNI L"Netscape Directory Synchronization Service"
#define DS_EVENT_NAME TEXT("Netscape DirSynch")
#define DSS_TERM_EVENT TEXT("NS_DSSYNCH")
-#define SYNCH_VERSION "5.0"
+#define SYNCH_VERSION "1.0.1"
#endif // _DSSYNCH_H_
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.8, 1.8.2.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/synctools/passwordsync/wix
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- PassSync.wxs 4 May 2005 23:45:07 -0000 1.8
+++ PassSync.wxs 11 Oct 2005 15:56:02 -0000 1.8.2.1
@@ -38,11 +38,11 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
<Product Name='Fedora Directory Password Sync' Id='C1842CD5-4659-4E7C-A53C-37083B0CB59F'
Language='1033' Codepage='1252'
- Version='1.0.0' Manufacturer='Fedora'>
+ Version='1.0.1' Manufacturer='Fedora Project'>
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="Fedora Directory Password Synchronization Installer"
- Manufacturer='Fedora'
+ Manufacturer='Fedora Project'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/ntds/wrapper/wix ntds.wxs, 1.5.2.1, 1.5.2.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/servers/ntds/wrapper/wix
Modified Files:
Tag: Directory71RtmBranch
ntds.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: ntds.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix/ntds.wxs,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- ntds.wxs 31 Aug 2005 21:40:53 -0000 1.5.2.1
+++ ntds.wxs 11 Oct 2005 15:56:01 -0000 1.5.2.2
@@ -38,7 +38,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
<Product Name='Fedora Directory Synchronization' Id='9FABDEC3-CAA0-40D5-871F-A0E1759C38C1'
Language='1033' Codepage='1252'
- Version='1.0.0' Manufacturer='Fedora Project'>
+ Version='1.0.1' Manufacturer='Fedora Project'>
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="Fedora Directory Synchronization Installer"
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.8, 1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/synctools/passwordsync/wix
Modified Files:
PassSync.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PassSync.wxs 4 May 2005 23:45:07 -0000 1.8
+++ PassSync.wxs 11 Oct 2005 15:40:40 -0000 1.9
@@ -38,11 +38,11 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
<Product Name='Fedora Directory Password Sync' Id='C1842CD5-4659-4E7C-A53C-37083B0CB59F'
Language='1033' Codepage='1252'
- Version='1.0.0' Manufacturer='Fedora'>
+ Version='1.0.1' Manufacturer='Fedora Project'>
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="Fedora Directory Password Synchronization Installer"
- Manufacturer='Fedora'
+ Manufacturer='Fedora Project'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/passsync dssynch.h, 1.5, 1.6
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/synctools/passwordsync/passsync
Modified Files:
dssynch.h
Log Message:
170321 - Increase winsync version to 1.0.1
Index: dssynch.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/dssynch.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dssynch.h 19 Apr 2005 22:07:44 -0000 1.5
+++ dssynch.h 11 Oct 2005 15:40:35 -0000 1.6
@@ -65,6 +65,6 @@
#define DS_SERVICE_NAME_UNI L"Netscape Directory Synchronization Service"
#define DS_EVENT_NAME TEXT("Netscape DirSynch")
#define DSS_TERM_EVENT TEXT("NS_DSSYNCH")
-#define SYNCH_VERSION "5.0"
+#define SYNCH_VERSION "1.0.1"
#endif // _DSSYNCH_H_
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/ntds/wrapper/wix ntds.wxs, 1.5, 1.6
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/servers/ntds/wrapper/wix
Modified Files:
ntds.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: ntds.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix/ntds.wxs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ntds.wxs 13 May 2005 03:20:20 -0000 1.5
+++ ntds.wxs 11 Oct 2005 15:40:35 -0000 1.6
@@ -38,11 +38,11 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
<Product Name='Fedora Directory Synchronization' Id='9FABDEC3-CAA0-40D5-871F-A0E1759C38C1'
Language='1033' Codepage='1252'
- Version='1.0.0' Manufacturer='Fedora'>
+ Version='1.0.1' Manufacturer='Fedora Project'>
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="Fedora Directory Synchronization Installer"
- Manufacturer='Fedora'
+ Manufacturer='Fedora Project'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
18 years, 7 months
[Fedora-directory-commits] mod_nss nss_engine_init.c,1.14,1.15
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22735
Modified Files:
nss_engine_init.c
Log Message:
Close the proxy model socket so NSS can be shutdown gracefully. Also
correct an error where the PKCS#11 slot isn't closed unless a the
certificate key is obtained. This also affected NSS_Shutdown().
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nss_engine_init.c 3 Oct 2005 14:59:26 -0000 1.14
+++ nss_engine_init.c 11 Oct 2005 15:01:34 -0000 1.15
@@ -756,11 +756,11 @@
nss_die();
}
- if (mctx->nickname != NULL)
+ if (mctx->nickname != NULL) {
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"Using nickname %s.", mctx->nickname);
-
- mctx->servercert = FindServerCertFromNickname(mctx->nickname);
+ mctx->servercert = FindServerCertFromNickname(mctx->nickname);
+ }
/* Verify the certificate chain. */
if (mctx->servercert != NULL && mctx->as_server) {
@@ -812,8 +812,8 @@
if (mctx->servercert) {
mctx->serverkey = PK11_FindPrivateKeyFromCert(slot, mctx->servercert, NULL);
- PK11_FreeSlot(slot);
}
+ PK11_FreeSlot(slot);
if (mctx->as_server && mctx->serverkey == NULL) {
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
@@ -952,6 +952,16 @@
shutdowncache = 1;
}
+ if (sc->proxy_enabled) {
+ if (sc->proxy->servercert != NULL) {
+ CERT_DestroyCertificate(sc->proxy->servercert);
+ SECKEY_DestroyPrivateKey(sc->proxy->serverkey);
+ }
+
+ /* Closing this implicitly cleans up the copy of the certificates
+ * and keys associated with any SSL socket */
+ PR_Close(sc->proxy->model);
+ }
}
if (shutdowncache)
18 years, 7 months
[Fedora-directory-commits] adminserver buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.15, 1.16
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2263/adminserver
Modified Files:
buildpaths.mk nsconfig.mk
Log Message:
by default, use the console ldapjdk.jar and JSS for building and packaging admin server
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk 6 Oct 2005 03:12:57 -0000 1.2
+++ buildpaths.mk 7 Oct 2005 21:49:29 -0000 1.3
@@ -90,10 +90,12 @@
MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
#MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
-LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
-JSS_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk
-CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
+#JSS_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+JSS_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/jss
ONLINEHELP_SOURCE_DIR = $(BUILD_ROOT)/../onlinehelp
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsconfig.mk 6 Oct 2005 03:12:57 -0000 1.15
+++ nsconfig.mk 7 Oct 2005 21:49:29 -0000 1.16
@@ -873,8 +873,12 @@
ifdef LDAPJDK_SOURCE_DIR
LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
else
+ifdef LDAPJDK_BUILD_DIR
+ LDAPJDK_DIR = $(LDAPJDK_BUILD_DIR)
+else
LDAPJDK_DIR = $(CLASS_DEST)
endif
+endif
#########################################
# JSS - jar and shared library
@@ -888,7 +892,11 @@
endif
JSS_LIBPATH = $(JSS_SOURCE_DIR)/dist/$(MOZ_OBJDIR_NAME)/lib
else
+ifdef INTERNAL_BUILD
JSS_JAR_DIR = $(CLASS_DEST)
+else
+ JSS_JAR_DIR = $(JSS_BUILD_DIR)
+endif
JSS_LIBPATH = $(JSS_BUILD_DIR)/lib
JSS_JAR_NAME = xpclass.jar
endif
18 years, 7 months
[Fedora-directory-commits] mod_admserv README,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv785
Modified Files:
README
Log Message:
updated README
Index: README
===================================================================
RCS file: /cvs/dirsec/mod_admserv/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README 27 Jun 2005 20:48:46 -0000 1.2
+++ README 7 Oct 2005 21:00:49 -0000 1.3
@@ -1,13 +1,7 @@
-To build and have it work you need to:
+mod_admserv - http://directory.fedora.redhat.com/wiki/mod_admserv
-export LD_LIBRARY_PATH=/opt/fedora-ds/bin/https/lib
-export NETSITE_ROOT=/opt/fedora-ds
+mod_admserv provides the HTTP functionality associated with the Fedora Administration Server http://directory.fedora.redhat.com/wiki/AdminServer. It is a standard Apache module and uses standard Apache build tools and configure. In addition, you will also need NSPR, NSS, and the LDAP C SDK from Mozilla, as well as the AdminUtil component provided as part of the Fedora DS - http://directory.fedora.redhat.com/wiki/AdminUtil.
-(or use redhat-ds)
+An example configure command is below, for use with Fedora Core 2 and Red Hat Enterprise Linux 3. For Fedora Core 3 and RHEL4, substitute Linux2.6 for Linux2.4 and RHEL4 for RHEL3 in the configure command.
-I configure it with:
-./configure --with-apr-config --with-apxs=/home/rcrit/redhat/apache/bin/apxs
-
-Internal LDAPSDK support is no longer needed.
-
-See httpd.conf.tmpl for extra configuration needed.
+./configure --with-apr-config --with-apxs=/usr/sbin/apxs --with-nspr-inc=../mozilla/dist/Linux2.4_x86_glibc_PTH_DBG.OBJ/include/ --with-nspr-lib=../mozilla/dist/Linux2.4_x86_glibc_PTH_DBG.OBJ/lib --with-nss-inc=../mozilla/dist/public/nss --with-nss-lib=../mozilla//dist/Linux2.4_x86_glibc_PTH_DBG.OBJ/lib/ --with-ldapsdk-inc=../mozilla/dist/public/ldap --with-ldapsdk-lib=../mozilla/dist/lib --with-adminutil=../adminutil/built/adminutil/RHEL3_x86_gcc3_DBG.OBJ/
18 years, 7 months