[Fedora-directory-commits] ldapserver component_versions.mk, 1.35.2.4, 1.35.2.5
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22970
Modified Files:
Tag: Directory71RtmBranch
component_versions.mk
Log Message:
Pull new ADSYNC component for bug 186765
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
diff -u -r1.35.2.4 -r1.35.2.5
--- component_versions.mk 18 Mar 2006 00:53:46 -0000 1.35.2.4
+++ component_versions.mk 18 Mar 2006 18:05:15 -0000 1.35.2.5
@@ -250,7 +250,7 @@
endif
ifndef ADSYNC_VERSION
- ADSYNC_VERSION=20060317
+ ADSYNC_VERSION=20060318
endif
ifndef NT4SYNC_VERSION
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.9, 1.10 proto-slap.h, 1.16, 1.17 util.c, 1.10, 1.11
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20981
Modified Files:
log.c proto-slap.h util.c
Log Message:
185811 - Fixed windows build failures when compiling slapd_chown_if_not_owner function
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- log.c 4 Dec 2005 01:54:37 -0000 1.9
+++ log.c 18 Mar 2006 17:57:39 -0000 1.10
@@ -3540,11 +3540,13 @@
return LOG_UNABLE_TO_OPENFILE;
}
+#ifndef _WIN32
/* make sure the logfile is owned by the localuser. If one of the
* alternate ns-slapd modes, such as db2bak, tries to log an error
* at startup, it will create the logfile as root!
*/
slapd_chown_if_not_owner(loginfo.log_error_file, pw->pw_uid, -1);
+#endif
loginfo.log_error_fdes = fp;
if (logfile_state == LOGFILE_REOPENED) {
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- proto-slap.h 25 Jan 2006 16:51:39 -0000 1.16
+++ proto-slap.h 18 Mar 2006 17:57:39 -0000 1.17
@@ -607,7 +607,9 @@
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
+#ifndef _WIN32
int slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
+#endif
int slapd_comp_path(char *p0, char *p1);
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- util.c 16 Feb 2006 17:39:53 -0000 1.10
+++ util.c 18 Mar 2006 17:57:39 -0000 1.11
@@ -717,6 +717,7 @@
Returns 0 upon success or non-zero otherwise, usually -1 if
some system error occurred
*/
+#ifndef _WIN32
int
slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
{
@@ -737,6 +738,7 @@
return result;
}
+#endif
/*
* Compare 2 pathes
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.6.2.1, 1.6.2.2 proto-slap.h, 1.10.2.2, 1.10.2.3 util.c, 1.6.2.1, 1.6.2.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20871
Modified Files:
Tag: Directory71RtmBranch
log.c proto-slap.h util.c
Log Message:
185811 - Fixed windows build failures when compiling slapd_chown_if_not_owner function
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- log.c 23 Nov 2005 01:22:16 -0000 1.6.2.1
+++ log.c 18 Mar 2006 17:48:37 -0000 1.6.2.2
@@ -3298,12 +3298,13 @@
*/
return LOG_UNABLE_TO_OPENFILE;
}
-
+#ifndef _WIN32
/* make sure the logfile is owned by the localuser. If one of the
* alternate ns-slapd modes, such as db2bak, tries to log an error
* at startup, it will create the logfile as root!
*/
slapd_chown_if_not_owner(loginfo.log_error_file, pw->pw_uid, -1);
+#endif
loginfo.log_error_fdes = fp;
if (logfile_state == LOGFILE_REOPENED) {
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- proto-slap.h 23 Nov 2005 01:22:16 -0000 1.10.2.2
+++ proto-slap.h 18 Mar 2006 17:48:37 -0000 1.10.2.3
@@ -588,7 +588,9 @@
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
-int slapd_slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
+#ifndef _WIN32
+int slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
+#endif
/*
* modify.c
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- util.c 23 Nov 2005 01:22:16 -0000 1.6.2.1
+++ util.c 18 Mar 2006 17:48:37 -0000 1.6.2.2
@@ -637,6 +637,7 @@
Returns 0 upon success or non-zero otherwise, usually -1 if
some system error occurred
*/
+#ifndef _WIN32
int
slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
{
@@ -657,4 +658,4 @@
return result;
}
-
+#endif
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.11, 1.1.2.12 redhat-patch.inf, 1.1.2.11, 1.1.2.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12419/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
fedora-patch.inf redhat-patch.inf
Log Message:
[185765] PassSync service leaks memory
Picking up fixed PassSync.msi
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- fedora-patch.inf 7 Mar 2006 00:52:08 -0000 1.1.2.11
+++ fedora-patch.inf 18 Mar 2006 00:53:51 -0000 1.1.2.12
@@ -59,7 +59,7 @@
file: 164836,165600: lib/attr-unique-plugin.*
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
-file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- redhat-patch.inf 7 Mar 2006 00:52:08 -0000 1.1.2.11
+++ redhat-patch.inf 18 Mar 2006 00:53:51 -0000 1.1.2.12
@@ -59,7 +59,7 @@
file: 164836,165600: lib/attr-unique-plugin.*
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
-file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
18 years, 1 month
[Fedora-directory-commits] ldapserver component_versions.mk, 1.35.2.3, 1.35.2.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12419
Modified Files:
Tag: Directory71RtmBranch
component_versions.mk
Log Message:
[185765] PassSync service leaks memory
Picking up fixed PassSync.msi
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.35.2.3
retrieving revision 1.35.2.4
diff -u -r1.35.2.3 -r1.35.2.4
--- component_versions.mk 15 Feb 2006 21:32:16 -0000 1.35.2.3
+++ component_versions.mk 18 Mar 2006 00:53:46 -0000 1.35.2.4
@@ -250,7 +250,7 @@
endif
ifndef ADSYNC_VERSION
- ADSYNC_VERSION=20051017
+ ADSYNC_VERSION=20060317
endif
ifndef NT4SYNC_VERSION
18 years, 1 month
[Fedora-directory-commits] winsync/passwordsync/wix PassSync.wxs, 1.12, 1.13
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256/passwordsync/wix
Modified Files:
PassSync.wxs
Log Message:
186765 - Fixed memory leaks in passsync service
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PassSync.wxs 14 Oct 2005 16:00:00 -0000 1.12
+++ PassSync.wxs 18 Mar 2006 00:36:57 -0000 1.13
@@ -38,7 +38,7 @@
<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.1' Manufacturer='Fedora Project'>
+ Version='1.0.2' Manufacturer='Fedora Project'>
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="Fedora Directory Password Synchronization Installer"
18 years, 1 month
[Fedora-directory-commits] winsync/passwordsync/passsync dssynch.h, 1.6, 1.7 syncserv.cpp, 1.11, 1.12
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256/passwordsync/passsync
Modified Files:
dssynch.h syncserv.cpp
Log Message:
186765 - Fixed memory leaks in passsync service
Index: dssynch.h
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/dssynch.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dssynch.h 11 Oct 2005 15:40:35 -0000 1.6
+++ dssynch.h 18 Mar 2006 00:36:39 -0000 1.7
@@ -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 "1.0.1"
+#define SYNCH_VERSION "1.0.2"
#endif // _DSSYNCH_H_
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- syncserv.cpp 14 Oct 2005 17:58:19 -0000 1.11
+++ syncserv.cpp 18 Mar 2006 00:36:39 -0000 1.12
@@ -242,6 +242,7 @@
}
exit:
+ clearSet(&passInfoList);
CloseHandle(passhookEventHandle);
}
@@ -254,7 +255,7 @@
PASS_INFO_LIST emptyPassInfoList;
PASS_INFO_LIST_ITERATOR currentPassInfo;
PASS_INFO_LIST_ITERATOR tempPassInfo;
- char* dn;
+ char* dn = NULL;
int tempSize = passInfoList.size();
if(loadSet(&passInfoList, dataFilename) == 0)
@@ -349,6 +350,9 @@
timeStamp(&outLog);
outLog << "Deferring password change for " << currentPassInfo->username << endl;
currentPassInfo++;
+ // free dn
+ ldap_memfree(dn);
+ dn = NULL;
continue;
}
else
@@ -366,6 +370,16 @@
timeStamp(&outLog);
outLog << "Removing password change from list" << endl;
}
+
+ // free the dn
+ ldap_memfree(dn);
+ dn = NULL;
+
+ // free the username and password
+ free(tempPassInfo->username);
+ free(tempPassInfo->password);
+
+ // remove the completed change from the list
passInfoList.erase(tempPassInfo);
}
}
@@ -447,7 +461,10 @@
int result = 0;
char searchFilter[SYNCSERV_BUF_SIZE];
- results = NULL;
+ if (results != NULL) {
+ ldap_msgfree(results);
+ results = NULL;
+ }
_snprintf(searchFilter, SYNCSERV_BUF_SIZE, "(%s=%s)", ldapUsernameField, username);
@@ -640,6 +657,12 @@
tempPassInfo = currentPassInfo;
currentPassInfo++;
+
+ // free the username and password
+ free(tempPassInfo->username);
+ free(tempPassInfo->password);
+
+ // remove the change from the list
passInfoList.erase(tempPassInfo);
}
else
18 years, 1 month
[Fedora-directory-commits] winsync/passwordsync passhand.cpp, 1.7, 1.8
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256/passwordsync
Modified Files:
passhand.cpp
Log Message:
186765 - Fixed memory leaks in passsync service
Index: passhand.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhand.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- passhand.cpp 19 Apr 2005 22:07:43 -0000 1.7
+++ passhand.cpp 18 Mar 2006 00:36:33 -0000 1.8
@@ -62,7 +62,7 @@
fstream outFile;
PASS_INFO_LIST_ITERATOR currentPair;
strstream plainTextStream;
- char* cipherTextBuf;
+ char* cipherTextBuf = NULL;
int usernameLen;
int passwordLen;
int plainTextLen;
@@ -90,7 +90,10 @@
// cipherTextBuf length must be at least plainTextLen + 8
cipherTextLen = plainTextLen + 8;
- cipherTextBuf = (char*)malloc(cipherTextLen);
+ if ((cipherTextBuf = (char*)malloc(cipherTextLen)) == NULL) {
+ result = -1;
+ goto exit;
+ }
if(encrypt(plainTextStream.str(), plainTextLen, cipherTextBuf, cipherTextLen, &resultTextLen) != 0)
{
@@ -109,6 +112,7 @@
outFile.close();
exit:
+ free(cipherTextBuf);
return result;
}
@@ -119,8 +123,8 @@
fstream inFile;
PASS_INFO newPair;
strstream* plainTextStream;
- char* cipherTextBuf;
- char* plainTextBuf;
+ char* cipherTextBuf = NULL;
+ char* plainTextBuf = NULL;
int usernameLen;
int passwordLen;
int plainTextLen;
@@ -145,6 +149,12 @@
cipherTextBuf = (char*)malloc(cipherTextLen);
plainTextBuf = (char*)malloc(plainTextLen);
+ if ((cipherTextBuf == NULL) || (plainTextBuf == NULL)) {
+ result = -1;
+ inFile.close();
+ goto exit;
+ }
+
inFile.read(cipherTextBuf, cipherTextLen);
inFile.close();
@@ -183,6 +193,8 @@
delete plainTextStream;
exit:
+ free(cipherTextBuf);
+ free(plainTextBuf);
return result;
}
@@ -205,7 +217,6 @@
PK11Context* EncContext = NULL;
unsigned char gKey[] = KEY;
unsigned char gIV[] = IV;
- PK11SymKey* key = NULL;
SECItem keyItem;
SECItem ivItem;
CK_MECHANISM_TYPE cipherMech = CKM_DES_CBC_PAD;
@@ -234,6 +245,7 @@
SymKey = PK11_ImportSymKey(slot, cipherMech, PK11_OriginUnwrap, CKA_ENCRYPT, &keyItem, NULL);
if(SymKey == NULL)
{
+ PK11_FreeSlot(slot);
result = PR_GetError();
goto exit;
}
@@ -247,6 +259,7 @@
if(SymKey != NULL)
{
PK11_FreeSymKey(SymKey);
+ PK11_FreeSlot(slot);
}
result = PR_GetError();
goto exit;
@@ -266,6 +279,7 @@
// Clean up
PK11_DestroyContext(EncContext, PR_TRUE);
PK11_FreeSymKey(SymKey);
+ PK11_FreeSlot(slot);
SECITEM_FreeItem(SecParam, PR_TRUE);
if((rv2 != SECSuccess) || (rv2 != SECSuccess))
@@ -288,7 +302,6 @@
PK11Context* EncContext = NULL;
unsigned char gKey[] = KEY;
unsigned char gIV[] = IV;
- PK11SymKey* key = NULL;
SECItem keyItem;
SECItem ivItem;
CK_MECHANISM_TYPE cipherMech = CKM_DES_CBC_PAD;
@@ -317,6 +330,7 @@
SymKey = PK11_ImportSymKey(slot, cipherMech, PK11_OriginUnwrap, CKA_ENCRYPT, &keyItem, NULL);
if(SymKey == NULL)
{
+ PK11_FreeSlot(slot);
result = PR_GetError();
goto exit;
}
@@ -330,6 +344,7 @@
if(SymKey != NULL)
{
PK11_FreeSymKey(SymKey);
+ PK11_FreeSlot(slot);
}
result = PR_GetError();
goto exit;
@@ -349,6 +364,7 @@
// Clean up
PK11_DestroyContext(EncContext, PR_TRUE);
PK11_FreeSymKey(SymKey);
+ PK11_FreeSlot(slot);
SECITEM_FreeItem(SecParam, PR_TRUE);
if((rv2 != SECSuccess) || (rv2 != SECSuccess))
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.8.2.4, 1.8.2.5
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12158/ldap/synctools/passwordsync/wix
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
186765 - Fixed memory leaks in passsync service
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- PassSync.wxs 14 Oct 2005 16:06:58 -0000 1.8.2.4
+++ PassSync.wxs 18 Mar 2006 00:32:11 -0000 1.8.2.5
@@ -38,7 +38,7 @@
<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.1' Manufacturer='Fedora Project'>
+ Version='1.0.2' Manufacturer='Fedora Project'>
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="Fedora Directory Password Synchronization Installer"
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync/passsync dssynch.h, 1.5.2.1, 1.5.2.2 syncserv.cpp, 1.7.2.4, 1.7.2.5
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12158/ldap/synctools/passwordsync/passsync
Modified Files:
Tag: Directory71RtmBranch
dssynch.h syncserv.cpp
Log Message:
186765 - Fixed memory leaks in passsync service
Index: dssynch.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/dssynch.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- dssynch.h 11 Oct 2005 15:56:01 -0000 1.5.2.1
+++ dssynch.h 18 Mar 2006 00:32:01 -0000 1.5.2.2
@@ -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 "1.0.1"
+#define SYNCH_VERSION "1.0.2"
#endif // _DSSYNCH_H_
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- syncserv.cpp 14 Oct 2005 17:59:01 -0000 1.7.2.4
+++ syncserv.cpp 18 Mar 2006 00:32:01 -0000 1.7.2.5
@@ -242,6 +242,7 @@
}
exit:
+ clearSet(&passInfoList);
CloseHandle(passhookEventHandle);
}
@@ -254,7 +255,7 @@
PASS_INFO_LIST emptyPassInfoList;
PASS_INFO_LIST_ITERATOR currentPassInfo;
PASS_INFO_LIST_ITERATOR tempPassInfo;
- char* dn;
+ char* dn = NULL;
int tempSize = passInfoList.size();
if(loadSet(&passInfoList, dataFilename) == 0)
@@ -349,6 +350,9 @@
timeStamp(&outLog);
outLog << "Deferring password change for " << currentPassInfo->username << endl;
currentPassInfo++;
+ // free dn
+ ldap_memfree(dn);
+ dn = NULL;
continue;
}
else
@@ -366,6 +370,16 @@
timeStamp(&outLog);
outLog << "Removing password change from list" << endl;
}
+
+ // free the dn
+ ldap_memfree(dn);
+ dn = NULL;
+
+ // free the username and password
+ free(tempPassInfo->username);
+ free(tempPassInfo->password);
+
+ // remove the completed change from the list
passInfoList.erase(tempPassInfo);
}
}
@@ -447,7 +461,10 @@
int result = 0;
char searchFilter[SYNCSERV_BUF_SIZE];
- results = NULL;
+ if (results != NULL) {
+ ldap_msgfree(results);
+ results = NULL;
+ }
_snprintf(searchFilter, SYNCSERV_BUF_SIZE, "(%s=%s)", ldapUsernameField, username);
@@ -640,6 +657,12 @@
tempPassInfo = currentPassInfo;
currentPassInfo++;
+
+ // free the username and password
+ free(tempPassInfo->username);
+ free(tempPassInfo->password);
+
+ // remove the change from the list
passInfoList.erase(tempPassInfo);
}
else
18 years, 1 month