build fixes (issue 318)
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 7 Jan 2014 20:18:03 +0000 (22:18 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 7 Jan 2014 20:18:03 +0000 (22:18 +0200)
Makefile.am
src/server/core/userdb_objects.cpp

index 1ab2e2e..f4bbb41 100644 (file)
@@ -14,5 +14,5 @@ SUBDIRS = m4 contrib src doc tools
 SUBDIRS += @TOP_LEVEL_MODULES@
 
 install-exec-hook:
-       if test "x@BUILD_SERVER@" = "xyes"; then LD_LIBRARY_PATH="$(DESTDIR)$(libdir)" $(DESTDIR)$(bindir)/nxmibc -d $(DESTDIR)$(pkgdatadir)/mibs -o $(DESTDIR)$(pkgdatadir)/mibs/netxms.mib; fi
+       if test "x@BUILD_SERVER@" = "xyes"; then LD_LIBRARY_PATH="$(DESTDIR)$(libdir):${LD_LIBRARY_PATH}" $(DESTDIR)$(bindir)/nxmibc -d $(DESTDIR)$(pkgdatadir)/mibs -o $(DESTDIR)$(pkgdatadir)/mibs/netxms.mib; fi
        if test "x@BUILD_SDK@" = "xyes"; then cp config.h $(DESTDIR)$(includedir); fi
index b9dd626..2bfffd6 100644 (file)
@@ -362,7 +362,7 @@ bool User::saveToDatabase(DB_HANDLE hdb)
    DBBind(hStmt, 10, DB_SQLTYPE_INTEGER, m_certMappingMethod);
    DBBind(hStmt, 11, DB_SQLTYPE_VARCHAR, m_certMappingData, DB_BIND_STATIC);
    DBBind(hStmt, 12, DB_SQLTYPE_INTEGER, m_authFailures);
-   DBBind(hStmt, 13, DB_SQLTYPE_INTEGER, m_lastPasswordChange);
+   DBBind(hStmt, 13, DB_SQLTYPE_INTEGER, (UINT32)m_lastPasswordChange);
    DBBind(hStmt, 14, DB_SQLTYPE_INTEGER, m_minPasswordLength);
    DBBind(hStmt, 15, DB_SQLTYPE_INTEGER, (UINT32)m_disabledUntil);
    DBBind(hStmt, 16, DB_SQLTYPE_INTEGER, (UINT32)m_lastLogin);