[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.11, 1.12
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039/wix
Modified Files:
PassSync.wxs
Log Message:
170556 - Make passsync obey backoff for retries when DS is down
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PassSync.wxs 12 Oct 2005 22:27:20 -0000 1.11
+++ PassSync.wxs 14 Oct 2005 16:00:00 -0000 1.12
@@ -137,7 +137,7 @@
<ServiceInstall Id='PassSyncEXE' Name='PassSync' DisplayName='Password Synchronization' Type='ownProcess'
Interactive='yes' Start='auto' Vital='yes' ErrorControl='normal'/>
- <ServiceControl Id='PassSyncEXE' Name='PassSync' Start='install' Stop='both' Remove='uninstall' Wait='yes'/>
+ <ServiceControl Id='PassSyncEXE' Name='PassSync' Start='install' Stop='both' Remove='uninstall' Wait='no'/>
<Registry Id='InstPath' Root='HKLM' Key='Software\PasswordSync' Name='Install Path' Action='write' Type='string' Value='[INSTALLDIR]' />
<Registry Id='HostName' Root='HKLM' Key='Software\PasswordSync' Name='Host Name' Action='write' Type='string' Value='[HOSTNAME]' />
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp, 1.9, 1.10
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039/passsync
Modified Files:
syncserv.cpp
Log Message:
170556 - Make passsync obey backoff for retries when DS is down
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- syncserv.cpp 13 Oct 2005 18:56:26 -0000 1.9
+++ syncserv.cpp 14 Oct 2005 16:00:00 -0000 1.10
@@ -101,7 +101,7 @@
}
else
{
- maxBackoffTime = pow(2, 12) * SYNCSERV_BASE_BACKOFF_LEN;
+ maxBackoffTime = (1 << 12) * SYNCSERV_BASE_BACKOFF_LEN;
}
size = SYNCSERV_BUF_SIZE;
@@ -177,6 +177,18 @@
void PassSyncService::Run()
{
isRunning = true;
+
+ // Initialize NSS
+ if(ldapssl_client_init(certPath, &certdbh) != 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Error initializing SSL: err=" << PR_GetError() << endl;
+ timeStamp(&outLog);
+ outLog << "Ensure that your SSL is setup correctly" << endl;
+
+ goto exit;
+ }
+
SyncPasswords();
while(isRunning)
@@ -229,6 +241,7 @@
}
}
+exit:
CloseHandle(passhookEventHandle);
}
@@ -244,15 +257,6 @@
char* dn;
int tempSize = passInfoList.size();
- if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
- {
- // log connection failure.
- timeStamp(&outLog);
- outLog << "Can not connect to ldap server in SyncPasswords" << endl;
-
- goto exit;
- }
-
if(loadSet(&passInfoList, dataFilename) == 0)
{
if((passInfoList.size() - tempSize) > 0)
@@ -293,6 +297,15 @@
}
}
+ if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
+ {
+ // log connection failure.
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
+
+ goto exit;
+ }
+
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
@@ -378,20 +391,6 @@
{
int result = 0;
- if(ldapssl_client_init(certPath, &certdbh) != 0)
- {
- result = PR_GetError();
-
- timeStamp(&outLog);
- outLog << "ldapssl_client_init failed in Connect" << endl;
- outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
-
- result = GetLastError();
-
- result = -1;
- goto exit;
- }
-
*connection = ldapssl_init(ldapHostName, atoi(ldapHostPort), 1);
if(*connection == NULL)
@@ -604,7 +603,7 @@
if(backoff > 0)
{
- backoffTime = pow(2, backoff) * SYNCSERV_BASE_BACKOFF_LEN;
+ backoffTime = (1 << backoff) * SYNCSERV_BASE_BACKOFF_LEN;
}
return backoffTime;
@@ -624,12 +623,12 @@
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
- if((currentPassInfo->atTime + (BackoffTime(currentPassInfo->backoffCount) / 1000)) <= currentTime)
+ if(((unsigned long)currentPassInfo->atTime + (BackoffTime(currentPassInfo->backoffCount) / 1000)) <= (unsigned long)currentTime)
{
currentPassInfo->backoffCount++;
}
- if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
+ if(((unsigned long)currentTime - (unsigned long)currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
timeStamp(&outLog);
outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
@@ -656,7 +655,7 @@
for(currentPassInfo = passInfoList.begin(); currentPassInfo != passInfoList.end(); currentPassInfo++)
{
- if(currentPassInfo->backoffCount < minBackoff)
+ if((unsigned long)currentPassInfo->backoffCount < minBackoff)
{
minBackoff = currentPassInfo->backoffCount;
}
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp, 1.7.2.1, 1.7.2.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10882
Modified Files:
Tag: Directory71RtmBranch
syncserv.cpp
Log Message:
170135 - Improved passsync logging facilities
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- syncserv.cpp 1 Jun 2005 18:30:53 -0000 1.7.2.1
+++ syncserv.cpp 13 Oct 2005 18:59:21 -0000 1.7.2.2
@@ -127,14 +127,12 @@
_snprintf(logPath, SYNCSERV_BUF_SIZE, "%spasssync.log", installPath);
_snprintf(dataFilename, SYNCSERV_BUF_SIZE, "%s\\system32\\passhook.dat", sysPath);
- if(logLevel > 0)
- {
- outLog.open(logPath, ios::out | ios::app);
- }
+ outLog.open(logPath, ios::out | ios::app);
+
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "begin log" << endl;
+ outLog << "PassSync service started" << endl;
}
PK11_SetPasswordFunc(passwdcb);
@@ -150,7 +148,7 @@
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "end log" << endl;
+ outLog << "PassSync service stopped" << endl;
}
outLog.close();
}
@@ -185,11 +183,27 @@
{
if(passInfoList.empty())
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Password list is empty. Waiting for passhook event" << endl;
+ }
WaitForSingleObject(passhookEventHandle, INFINITE);
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Received passhook event. Attempting sync" << endl;
+ }
}
else
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backing off for " << BackoffTime(GetMinBackoff()) << "ms" << endl;
+ }
WaitForSingleObject(passhookEventHandle, BackoffTime(GetMinBackoff()));
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backoff time expired. Attempting sync" << endl;
+ }
}
SyncPasswords();
@@ -198,20 +212,20 @@
ResetEvent(passhookEventHandle);
}
- if(saveSet(&passInfoList, dataFilename) == 0)
+ if(passInfoList.size() > 0)
{
- if(outLog.is_open())
+ if(saveSet(&passInfoList, dataFilename) == 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() << " entries saved to file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() << " entries saved to data file" << endl;
+ }
}
- }
- else
- {
- if(outLog.is_open())
+ else
{
timeStamp(&outLog);
- outLog << "failed to save entries to file" << endl;
+ outLog << "Failed to save entries to data file" << endl;
}
}
@@ -233,89 +247,117 @@
if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
{
// log connection failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "can not connect to ldap server in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
goto exit;
}
if(loadSet(&passInfoList, dataFilename) == 0)
{
- if(outLog.is_open())
+ if((passInfoList.size() - tempSize) > 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() - tempSize << " new entries loaded from file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() - tempSize << " new entries loaded from data file" << endl;
+ }
+
+ if(saveSet(&emptyPassInfoList, dataFilename) == 0)
+ {
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Cleared contents of data file" << endl;
+ }
+ }
+ else
+ {
+ timeStamp(&outLog);
+ outLog << "Failed to clear contents of data file" << endl;
+ }
}
- saveSet(&emptyPassInfoList, dataFilename);
}
else
{
- if(outLog.is_open())
+ timeStamp(&outLog);
+ outLog << "Failed to load entries from file" << endl;
+ }
+
+ if(passInfoList.size() > 0)
+ {
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "failed to load entries from file" << endl;
+ outLog << "Password list has " << passInfoList.size() << " entries" << endl;
}
}
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Attempting to sync password for " << currentPassInfo->username << endl;
+ }
+
if(QueryUsername(currentPassInfo->username) == 0)
{
while((dn = GetDN()) != NULL)
{
if(FutureOccurrence(currentPassInfo))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "newer modifies exist: " << currentPassInfo->username << endl;
+ outLog << "Newer password changes for " << currentPassInfo->username << " exist" << endl;
}
}
else if(MultipleResults() && !SYNCSERV_ALLOW_MULTI_MOD)
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "multiple results not allowed: " << currentPassInfo->username << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Multiple results not allowed: " << currentPassInfo->username << endl;
}
else if(CanBind(dn, currentPassInfo->password))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password match, no modify preformed: " << currentPassInfo->username << endl;
+ outLog << "Password match, no modify performed: " << currentPassInfo->username << endl;
}
}
else if(ModifyPassword(dn, currentPassInfo->password) != 0)
{
// log modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "modify password for " << currentPassInfo->username << " failed in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Modify password failed for remote entry: " << dn << endl;
}
else
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password for " << currentPassInfo->username << " modified" << endl;
- outLog << "\t" << dn << endl;
+ outLog << "Password modified for remote entry: " << dn << endl;
}
}
tempPassInfo = currentPassInfo;
currentPassInfo++;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Removing password change from list" << endl;
+ }
passInfoList.erase(tempPassInfo);
}
}
else
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Deferring password change for " << currentPassInfo->username << endl;
+ }
currentPassInfo++;
}
}
@@ -340,12 +382,9 @@
{
result = PR_GetError();
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_client_init failed in Connect" << endl;
- //outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_client_init failed in Connect" << endl;
+ outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
result = GetLastError();
@@ -357,11 +396,8 @@
if(*connection == NULL)
{
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_init failed in Connect" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_init failed in Connect" << endl;
result = -1;
goto exit;
@@ -371,12 +407,12 @@
if(lastLdapError != LDAP_SUCCESS)
{
- // log reason for bind failure.
- if(outLog.is_open())
+ // Log error if we're binding as ldapAuthUsername
+ if(strcmp(dn, ldapAuthUsername) == 0)
{
- //timeStamp(&outLog);
- //outLog << "ldap error in Connect" << endl;
- //outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
+ timeStamp(&outLog);
+ outLog << "Ldap bind error in Connect" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
}
result = -1;
@@ -411,27 +447,30 @@
_snprintf(searchFilter, SYNCSERV_BUF_SIZE, "(%s=%s)", ldapUsernameField, username);
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Searching for (" << ldapUsernameField << "=" << username << ")" << endl;
+ }
+
lastLdapError = ldap_search_ext_s(mainLdapConnection, ldapSearchBase, LDAP_SCOPE_SUBTREE, searchFilter, NULL, 0, NULL, NULL, NULL, -1, &results);
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for search failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in QueryUsername" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in QueryUsername" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
goto exit;
}
if(ldap_first_entry(mainLdapConnection, results) == NULL)
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "there are no entries that match: " << username << endl;
+ outLog << "There are no entries that match: " << username << endl;
}
result = -1;
goto exit;
@@ -480,12 +519,9 @@
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in ModifyPassword" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in ModifyPassword" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
}
@@ -595,11 +631,8 @@
if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
tempPassInfo = currentPassInfo;
currentPassInfo++;
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp, 1.8, 1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842
Modified Files:
syncserv.cpp
Log Message:
170135 - Improved passsync logging facilities
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- syncserv.cpp 1 Jun 2005 18:10:42 -0000 1.8
+++ syncserv.cpp 13 Oct 2005 18:56:26 -0000 1.9
@@ -127,14 +127,12 @@
_snprintf(logPath, SYNCSERV_BUF_SIZE, "%spasssync.log", installPath);
_snprintf(dataFilename, SYNCSERV_BUF_SIZE, "%s\\system32\\passhook.dat", sysPath);
- if(logLevel > 0)
- {
- outLog.open(logPath, ios::out | ios::app);
- }
+ outLog.open(logPath, ios::out | ios::app);
+
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "begin log" << endl;
+ outLog << "PassSync service started" << endl;
}
PK11_SetPasswordFunc(passwdcb);
@@ -150,7 +148,7 @@
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "end log" << endl;
+ outLog << "PassSync service stopped" << endl;
}
outLog.close();
}
@@ -185,11 +183,27 @@
{
if(passInfoList.empty())
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Password list is empty. Waiting for passhook event" << endl;
+ }
WaitForSingleObject(passhookEventHandle, INFINITE);
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Received passhook event. Attempting sync" << endl;
+ }
}
else
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backing off for " << BackoffTime(GetMinBackoff()) << "ms" << endl;
+ }
WaitForSingleObject(passhookEventHandle, BackoffTime(GetMinBackoff()));
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backoff time expired. Attempting sync" << endl;
+ }
}
SyncPasswords();
@@ -198,20 +212,20 @@
ResetEvent(passhookEventHandle);
}
- if(saveSet(&passInfoList, dataFilename) == 0)
+ if(passInfoList.size() > 0)
{
- if(outLog.is_open())
+ if(saveSet(&passInfoList, dataFilename) == 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() << " entries saved to file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() << " entries saved to data file" << endl;
+ }
}
- }
- else
- {
- if(outLog.is_open())
+ else
{
timeStamp(&outLog);
- outLog << "failed to save entries to file" << endl;
+ outLog << "Failed to save entries to data file" << endl;
}
}
@@ -233,89 +247,117 @@
if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
{
// log connection failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "can not connect to ldap server in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
goto exit;
}
if(loadSet(&passInfoList, dataFilename) == 0)
{
- if(outLog.is_open())
+ if((passInfoList.size() - tempSize) > 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() - tempSize << " new entries loaded from file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() - tempSize << " new entries loaded from data file" << endl;
+ }
+
+ if(saveSet(&emptyPassInfoList, dataFilename) == 0)
+ {
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Cleared contents of data file" << endl;
+ }
+ }
+ else
+ {
+ timeStamp(&outLog);
+ outLog << "Failed to clear contents of data file" << endl;
+ }
}
- saveSet(&emptyPassInfoList, dataFilename);
}
else
{
- if(outLog.is_open())
+ timeStamp(&outLog);
+ outLog << "Failed to load entries from file" << endl;
+ }
+
+ if(passInfoList.size() > 0)
+ {
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "failed to load entries from file" << endl;
+ outLog << "Password list has " << passInfoList.size() << " entries" << endl;
}
}
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Attempting to sync password for " << currentPassInfo->username << endl;
+ }
+
if(QueryUsername(currentPassInfo->username) == 0)
{
while((dn = GetDN()) != NULL)
{
if(FutureOccurrence(currentPassInfo))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "newer modifies exist: " << currentPassInfo->username << endl;
+ outLog << "Newer password changes for " << currentPassInfo->username << " exist" << endl;
}
}
else if(MultipleResults() && !SYNCSERV_ALLOW_MULTI_MOD)
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "multiple results not allowed: " << currentPassInfo->username << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Multiple results not allowed: " << currentPassInfo->username << endl;
}
else if(CanBind(dn, currentPassInfo->password))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password match, no modify preformed: " << currentPassInfo->username << endl;
+ outLog << "Password match, no modify performed: " << currentPassInfo->username << endl;
}
}
else if(ModifyPassword(dn, currentPassInfo->password) != 0)
{
// log modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "modify password for " << currentPassInfo->username << " failed in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Modify password failed for remote entry: " << dn << endl;
}
else
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password for " << currentPassInfo->username << " modified" << endl;
- outLog << "\t" << dn << endl;
+ outLog << "Password modified for remote entry: " << dn << endl;
}
}
tempPassInfo = currentPassInfo;
currentPassInfo++;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Removing password change from list" << endl;
+ }
passInfoList.erase(tempPassInfo);
}
}
else
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Deferring password change for " << currentPassInfo->username << endl;
+ }
currentPassInfo++;
}
}
@@ -340,12 +382,9 @@
{
result = PR_GetError();
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_client_init failed in Connect" << endl;
- //outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_client_init failed in Connect" << endl;
+ outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
result = GetLastError();
@@ -357,11 +396,8 @@
if(*connection == NULL)
{
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_init failed in Connect" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_init failed in Connect" << endl;
result = -1;
goto exit;
@@ -371,12 +407,12 @@
if(lastLdapError != LDAP_SUCCESS)
{
- // log reason for bind failure.
- if(outLog.is_open())
+ // Log error if we're binding as ldapAuthUsername
+ if(strcmp(dn, ldapAuthUsername) == 0)
{
- //timeStamp(&outLog);
- //outLog << "ldap error in Connect" << endl;
- //outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
+ timeStamp(&outLog);
+ outLog << "Ldap bind error in Connect" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
}
result = -1;
@@ -411,27 +447,30 @@
_snprintf(searchFilter, SYNCSERV_BUF_SIZE, "(%s=%s)", ldapUsernameField, username);
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Searching for (" << ldapUsernameField << "=" << username << ")" << endl;
+ }
+
lastLdapError = ldap_search_ext_s(mainLdapConnection, ldapSearchBase, LDAP_SCOPE_SUBTREE, searchFilter, NULL, 0, NULL, NULL, NULL, -1, &results);
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for search failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in QueryUsername" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in QueryUsername" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
goto exit;
}
if(ldap_first_entry(mainLdapConnection, results) == NULL)
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "there are no entries that match: " << username << endl;
+ outLog << "There are no entries that match: " << username << endl;
}
result = -1;
goto exit;
@@ -480,12 +519,9 @@
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in ModifyPassword" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in ModifyPassword" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
}
@@ -595,11 +631,8 @@
if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
tempPassInfo = currentPassInfo;
currentPassInfo++;
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync build.bat, 1.8, 1.8.2.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12010
Modified Files:
Tag: Directory71RtmBranch
build.bat
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/build.bat,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- build.bat 16 May 2005 19:41:38 -0000 1.8
+++ build.bat 12 Oct 2005 23:27:59 -0000 1.8.2.1
@@ -108,6 +108,15 @@
if EXIST ..\%LIBROOT%\nss\lib\softokn3.dll (
copy /Y ..\%LIBROOT%\nss\lib\softokn3.dll %OBJDEST%\
)
+if EXIST ..\%LIBROOT%\nss\lib\smime3.dll (
+ copy /Y ..\%LIBROOT%\nss\lib\smime3.dll %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\certutil.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\certutil.exe %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\pk12util.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\pk12util.exe %OBJDEST%\
+)
xcopy /E /Y /I %WXSDIR%\Binary %OBJDEST%\Binary
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync build.bat, 1.8, 1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11976
Modified Files:
build.bat
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/build.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.bat 16 May 2005 19:41:38 -0000 1.8
+++ build.bat 12 Oct 2005 23:26:52 -0000 1.9
@@ -108,6 +108,15 @@
if EXIST ..\%LIBROOT%\nss\lib\softokn3.dll (
copy /Y ..\%LIBROOT%\nss\lib\softokn3.dll %OBJDEST%\
)
+if EXIST ..\%LIBROOT%\nss\lib\smime3.dll (
+ copy /Y ..\%LIBROOT%\nss\lib\smime3.dll %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\certutil.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\certutil.exe %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\pk12util.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\pk12util.exe %OBJDEST%\
+)
xcopy /E /Y /I %WXSDIR%\Binary %OBJDEST%\Binary
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.8.2.2, 1.8.2.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10391
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- PassSync.wxs 12 Oct 2005 18:41:03 -0000 1.8.2.2
+++ PassSync.wxs 12 Oct 2005 22:30:04 -0000 1.8.2.3
@@ -74,51 +74,51 @@
<Directory Id='TARGETDIR' Name='SourceDir'>
-
- <Directory Id='SystemFolder' Name='SysDir'>
-
- <Component Id='HookLibrary' Guid='93790ACE-F522-413C-AEE3-DF05D99BAA6D'>
- <File Id='PasshookDLL' Name='passhook.dll' DiskId='1' src='passhook.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSLDAPLibrary' Guid='E3B9046B-1B9B-4E19-81F3-0A8D14CF72B2'>
- <File Id='NSLDAP' LongName='nsldap32v50.dll' Name='nsldap.dll' DiskId='1' src='nsldap32v50.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSLDAPSSLLibrary' Guid='794345C6-74B8-4917-A2E6-4DC9DCCFECD2'>
- <File Id='NSLDAPSSL' LongName='nsldapssl32v50.dll' Name='nsldapss.dll' DiskId='1' src='nsldapssl32v50.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSLDAPPRLibrary' Guid='D6ABE406-7663-4E27-81F3-482860FD6375'>
- <File Id='NSLDAPRP' LongName='nsldappr32v50.dll' Name='nsldappr.dll' DiskId='1' src='nsldappr32v50.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRLibrary' Guid='7DFF5449-F38C-4C3B-9876-E32A123F1EA5'>
- <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRpldsLibrary' Guid='50C89341-754F-4092-8307-129DB119B42E'>
- <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRplcLibrary' Guid='1B8B1D78-E2C1-4F3A-A841-C79FFE26E6E0'>
- <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSLibrary' Guid='5E122346-6B77-456D-BCC5-76D7FA8AF258'>
- <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsslLibrary' Guid='A39CC896-F455-4701-9BF0-D1E31C116DE2'>
- <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsoftoknLibrary' Guid='9C57A076-D52A-4E74-A46A-DDF916A7D8BD'>
- <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
- </Component>
-
- </Directory>
-
+ <Directory Id='SystemFolder' Name='SysDir'>
+ <Component Id='HookLibrary' Guid='93790ACE-F522-413C-AEE3-DF05D99BAA6D'>
+ <File Id='PasshookDLL' Name='passhook.dll' DiskId='1' src='passhook.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSLDAPLibrary' Guid='E3B9046B-1B9B-4E19-81F3-0A8D14CF72B2'>
+ <File Id='NSLDAP' LongName='nsldap32v50.dll' Name='nsldap.dll' DiskId='1' src='nsldap32v50.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSLDAPSSLLibrary' Guid='794345C6-74B8-4917-A2E6-4DC9DCCFECD2'>
+ <File Id='NSLDAPSSL' LongName='nsldapssl32v50.dll' Name='nsldapss.dll' DiskId='1' src='nsldapssl32v50.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSLDAPPRLibrary' Guid='D6ABE406-7663-4E27-81F3-482860FD6375'>
+ <File Id='NSLDAPRP' LongName='nsldappr32v50.dll' Name='nsldappr.dll' DiskId='1' src='nsldappr32v50.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRLibrary' Guid='7DFF5449-F38C-4C3B-9876-E32A123F1EA5'>
+ <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRpldsLibrary' Guid='50C89341-754F-4092-8307-129DB119B42E'>
+ <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRplcLibrary' Guid='1B8B1D78-E2C1-4F3A-A841-C79FFE26E6E0'>
+ <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSLibrary' Guid='5E122346-6B77-456D-BCC5-76D7FA8AF258'>
+ <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsslLibrary' Guid='A39CC896-F455-4701-9BF0-D1E31C116DE2'>
+ <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsoftoknLibrary' Guid='9C57A076-D52A-4E74-A46A-DDF916A7D8BD'>
+ <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsmimeLibrary' Guid='E1030203-0A43-4767-BF5F-C7A51C687040'>
+ <File Id='NSSSMIME' LongName='smime3.dll' Name='smime3.dll' DiskId='1' src='smime3.dll' Vital='yes' />
+ </Component>
+ </Directory>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
@@ -151,8 +151,15 @@
<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'/>
+ </Component>
- </Component>
+ <Component Id='NSScertutil' Guid='EE2FB62B-E104-4049-8A6D-B96D4524FC29'>
+ <File Id='NSSCERTUTIL' LongName='certutil.exe' Name='certutil.exe' DiskId='1' src='certutil.exe' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSpk12util' Guid='13393BA9-550A-4330-85B9-76F14225A6D7'>
+ <File Id='NSSPK12UTIL' LongName='pk12util.exe' Name='pk12util.exe' DiskId='1' src='pk12util.exe' Vital='yes' />
+ </Component>
</Directory>
</Directory>
@@ -181,6 +188,9 @@
<ComponentRef Id='NSSLibrary' />
<ComponentRef Id='NSSsslLibrary' />
<ComponentRef Id='NSSsoftoknLibrary' />
+ <ComponentRef Id='NSSsmimeLibrary' />
+ <ComponentRef Id='NSScertutil' />
+ <ComponentRef Id='NSSpk12util' />
</Feature>
</Feature>
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.10, 1.11
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10364
Modified Files:
PassSync.wxs
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PassSync.wxs 12 Oct 2005 18:37:35 -0000 1.10
+++ PassSync.wxs 12 Oct 2005 22:27:20 -0000 1.11
@@ -74,51 +74,51 @@
<Directory Id='TARGETDIR' Name='SourceDir'>
-
- <Directory Id='SystemFolder' Name='SysDir'>
-
- <Component Id='HookLibrary' Guid='93790ACE-F522-413C-AEE3-DF05D99BAA6D'>
- <File Id='PasshookDLL' Name='passhook.dll' DiskId='1' src='passhook.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSLDAPLibrary' Guid='E3B9046B-1B9B-4E19-81F3-0A8D14CF72B2'>
- <File Id='NSLDAP' LongName='nsldap32v50.dll' Name='nsldap.dll' DiskId='1' src='nsldap32v50.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSLDAPSSLLibrary' Guid='794345C6-74B8-4917-A2E6-4DC9DCCFECD2'>
- <File Id='NSLDAPSSL' LongName='nsldapssl32v50.dll' Name='nsldapss.dll' DiskId='1' src='nsldapssl32v50.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSLDAPPRLibrary' Guid='D6ABE406-7663-4E27-81F3-482860FD6375'>
- <File Id='NSLDAPRP' LongName='nsldappr32v50.dll' Name='nsldappr.dll' DiskId='1' src='nsldappr32v50.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRLibrary' Guid='7DFF5449-F38C-4C3B-9876-E32A123F1EA5'>
- <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRpldsLibrary' Guid='50C89341-754F-4092-8307-129DB119B42E'>
- <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRplcLibrary' Guid='1B8B1D78-E2C1-4F3A-A841-C79FFE26E6E0'>
- <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSLibrary' Guid='5E122346-6B77-456D-BCC5-76D7FA8AF258'>
- <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsslLibrary' Guid='A39CC896-F455-4701-9BF0-D1E31C116DE2'>
- <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsoftoknLibrary' Guid='9C57A076-D52A-4E74-A46A-DDF916A7D8BD'>
- <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
- </Component>
-
- </Directory>
-
+ <Directory Id='SystemFolder' Name='SysDir'>
+ <Component Id='HookLibrary' Guid='93790ACE-F522-413C-AEE3-DF05D99BAA6D'>
+ <File Id='PasshookDLL' Name='passhook.dll' DiskId='1' src='passhook.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSLDAPLibrary' Guid='E3B9046B-1B9B-4E19-81F3-0A8D14CF72B2'>
+ <File Id='NSLDAP' LongName='nsldap32v50.dll' Name='nsldap.dll' DiskId='1' src='nsldap32v50.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSLDAPSSLLibrary' Guid='794345C6-74B8-4917-A2E6-4DC9DCCFECD2'>
+ <File Id='NSLDAPSSL' LongName='nsldapssl32v50.dll' Name='nsldapss.dll' DiskId='1' src='nsldapssl32v50.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSLDAPPRLibrary' Guid='D6ABE406-7663-4E27-81F3-482860FD6375'>
+ <File Id='NSLDAPRP' LongName='nsldappr32v50.dll' Name='nsldappr.dll' DiskId='1' src='nsldappr32v50.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRLibrary' Guid='7DFF5449-F38C-4C3B-9876-E32A123F1EA5'>
+ <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRpldsLibrary' Guid='50C89341-754F-4092-8307-129DB119B42E'>
+ <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRplcLibrary' Guid='1B8B1D78-E2C1-4F3A-A841-C79FFE26E6E0'>
+ <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSLibrary' Guid='5E122346-6B77-456D-BCC5-76D7FA8AF258'>
+ <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsslLibrary' Guid='A39CC896-F455-4701-9BF0-D1E31C116DE2'>
+ <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsoftoknLibrary' Guid='9C57A076-D52A-4E74-A46A-DDF916A7D8BD'>
+ <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsmimeLibrary' Guid='E1030203-0A43-4767-BF5F-C7A51C687040'>
+ <File Id='NSSSMIME' LongName='smime3.dll' Name='smime3.dll' DiskId='1' src='smime3.dll' Vital='yes' />
+ </Component>
+ </Directory>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
@@ -151,8 +151,15 @@
<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'/>
+ </Component>
- </Component>
+ <Component Id='NSScertutil' Guid='EE2FB62B-E104-4049-8A6D-B96D4524FC29'>
+ <File Id='NSSCERTUTIL' LongName='certutil.exe' Name='certutil.exe' DiskId='1' src='certutil.exe' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSpk12util' Guid='13393BA9-550A-4330-85B9-76F14225A6D7'>
+ <File Id='NSSPK12UTIL' LongName='pk12util.exe' Name='pk12util.exe' DiskId='1' src='pk12util.exe' Vital='yes' />
+ </Component>
</Directory>
</Directory>
@@ -181,6 +188,9 @@
<ComponentRef Id='NSSLibrary' />
<ComponentRef Id='NSSsslLibrary' />
<ComponentRef Id='NSSsoftoknLibrary' />
+ <ComponentRef Id='NSSsmimeLibrary' />
+ <ComponentRef Id='NSScertutil' />
+ <ComponentRef Id='NSSpk12util' />
</Feature>
</Feature>
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.8, 1.30.2.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8886
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[167982] Service Pack framework
fixed RHEL build failure: should have used simply expanded variable when generating a temporary directory name to store the 7.1 RTM package.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
diff -u -r1.30.2.8 -r1.30.2.9
--- Makefile 28 Sep 2005 22:47:13 -0000 1.30.2.8
+++ Makefile 12 Oct 2005 21:57:03 -0000 1.30.2.9
@@ -218,8 +218,8 @@
ABSRELDIR = $(ABSBUILD_ROOT)/built/release
GENRPMPATCH = $(ABSBUILD_ROOT)/ldap/cm/genRpmPatch.pl
PATCHINF = $(ABSBUILD_ROOT)/ldap/cm/fedora-patch.inf
-DATETIME = $(shell date +%Y%m%d-%H%M%S)
-SPEXT = .SP.$(DATETIME)
+DATETIME := $(shell date +%Y%m%d-%H%M%S)
+SPEXT := .SP.$(DATETIME)
# This is the directory where we put what we're making: the files which go on the CD.
ifndef INSTDIR
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.8.2.1, 1.8.2.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3982
Modified Files:
Tag: Directory71RtmBranch
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.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- PassSync.wxs 11 Oct 2005 15:56:02 -0000 1.8.2.1
+++ PassSync.wxs 12 Oct 2005 18:41:03 -0000 1.8.2.2
@@ -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