Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv348/passwordsync/passsync
Modified Files:
passsync.mak service.cpp syncserv.cpp
Log Message:
Related: 490048
Summary: Fixed debug passsync builds.
Index: passsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- passsync.mak 16 Feb 2009 22:20:21 -0000 1.8
+++ passsync.mak 30 Mar 2009 18:15:29 -0000 1.9
@@ -90,18 +90,23 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -167,18 +172,23 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -229,34 +239,3 @@
!ENDIF
!ENDIF
-
-!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" ==
"passsync - Win32 Debug"
-SOURCE=.\ntservice.cpp
-
-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\service.cpp
-
-"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\subuniutil.cpp
-
-"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\syncserv.cpp
-
-"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
Index: service.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/service.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- service.cpp 16 Feb 2009 22:20:21 -0000 1.7
+++ service.cpp 30 Mar 2009 18:15:29 -0000 1.8
@@ -58,11 +58,6 @@
//#include "dsperson.h"
#include "synchcmds.h"
#include "dssynch.h"
-
-#ifdef _DEBUG
-void doDebug( PassSyncService *pSynch );
-#endif // _DEBUG
-
//#include <nspr.h>
/////////////////////////////////////////////////////////////////
@@ -330,9 +325,6 @@
exit(theSynch.m_Status.dwWin32ExitCode);
- ////////// That's it - the rest is debugging stuff //////
-#ifdef _DEBUG
- doDebug( &theSynch );
-#endif
+ ////////// That's it //////
return 0;
}
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- syncserv.cpp 13 Feb 2009 23:39:44 -0000 1.15
+++ syncserv.cpp 30 Mar 2009 18:15:29 -0000 1.16
@@ -504,6 +504,11 @@
int result = 0;
char searchFilter[SYNCSERV_BUF_SIZE];
+ if (username == NULL)
+ {
+ goto exit;
+ }
+
if (results != NULL) {
ldap_msgfree(results);
results = NULL;