Commit Graph

29 Commits

Author SHA1 Message Date
Linwood-F 6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Isaac Connor 6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Isaac Connor 8f4fb8bb64 fix mysql_escape_String call. Must use strlen, not sizeof 2014-06-26 14:44:37 -04:00
Isaac Connor 20bccdf431 use the size of the username and password when calling mysql_escape_string 2014-06-25 16:23:10 -04:00
Isaac Connor 0592276f53 fix mysql_escape_string calls after referring to docs 2014-06-24 11:22:08 -04:00
Isaac Connor 93aed26a00 escape username and password inside zm_user
by rogerroger288
2014-06-05 15:18:02 -04:00
Andy 4e9698ae13 Fix for Issue #88 - ZMS crashing
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 07:22:41 -05:00
Isaac Connor cdac403fb1 Merge ../zum into develop
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
Isaac Connor ce61512a0d gnutls changes from ubuntu package 2013-04-29 15:32:55 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
stan 8dd2bbfc17 Support gnutls md5 generation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3660 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:00:20 +00:00
stan 7a08ab3c24 Added in some includes that are required on some systems.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3489 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:31:06 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:22:35 +00:00
stan ca4358bfd6 Initial libgcrypt to remove warning in zms and zmu
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:11:06 +00:00
stan e6041e24a7 Uppdated copyright headers
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:33:23 +00:00
stan ee44d4b274 Updated debug format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:43:47 +00:00
stan 9c5f73dd10 Bug 462 - Now supports gnutls and openssl
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2310 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:44:44 +00:00
stan 93c2ec048c Bug 428 - Fixed incorrect gnutls #defines.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2273 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:49:21 +00:00
stan 235dde1a80 Updated copyright statement.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1829 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 10:56:30 +00:00
stan 65f7cf09b5 Bug 216 - Zone polygons
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1630 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 17:51:06 +00:00
stan 46585d9cc2 Bug 148 - Allows remote http authentication.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1531 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 15:42:41 +00:00
stan 044450901b Bug 163 - Added control permissions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1506 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-16 21:11:44 +00:00
stan f089f28bd4 Added simplified direct config interface.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1406 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-16 09:27:06 +00:00
stan f7ebb4f3b7 Fixed problem with restricted monitor ids setting being lost.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1386 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-03-20 19:32:18 +00:00
stan 264c23d687 Updated copyright statement
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1360 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-02-24 14:40:14 +00:00
stan 970f0c687c Fixed premature check of HAVELIBCRYPTO
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1267 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-31 12:07:38 +00:00
stan 76bc4cb613 Fixed user sql, added debug and wrapped in check for libcrypto
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1243 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-26 20:55:50 +00:00
stan e56123b8c0 Totally revamped authentication for zms and zmu
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1226 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-19 01:50:24 +00:00