From 18ecd46a01767292b57668adeeb0429864bdb45e Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 9 Jun 2011 21:22:08 +0000 Subject: [PATCH] changed: when winix demonizes it creates a three new descriptors (0, 1 and 3) pointing to /dev/null added: DbBase::AssertValueBin(PGresult * r, int row, int col, std::string & result) it reads binary (bytea) data added: DbTextStream can handle 'bool' types now (is puts 'true' of 'false' to the stream) changed: now passwords can be stored either as plain text, a hash or can be encrypted with RSA currently we have following hashes: md4, md5, sha1, sha224, sha256, sha384, sha512 we are using openssl to manage them (look at config options for more info) changed: winix version to 0.4.7 added: class Run - you can run any program from os and send a buffer to its standard input and read what the program put on its standard output added: class Crypt (in System) - calculating hashes, and crypting/decrypting git-svn-id: svn://ttmath.org/publicrep/winix/trunk@734 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/Makefile.dep | 123 ++++++----- core/Makefile.o.dep | 2 +- core/config.cpp | 32 ++- core/config.h | 47 +++- core/crypt.cpp | 273 +++++++++++++++++++++++ core/crypt.h | 209 ++++++++++++++++++ core/run.cpp | 385 +++++++++++++++++++++++++++++++++ core/run.h | 163 ++++++++++++++ core/system.cpp | 2 + core/system.h | 3 + core/user.h | 16 +- core/version.h | 4 +- db/db.cpp | 46 ++-- db/db.h | 6 +- db/dbbase.cpp | 102 ++++++++- db/dbbase.h | 12 +- db/dbtextstream.cpp | 28 ++- db/dbtextstream.h | 4 +- functions/Makefile.dep | 224 ++++++++++--------- functions/adduser.cpp | 41 +++- functions/adduser.h | 7 +- functions/login.cpp | 87 +++++++- functions/login.h | 11 +- html/fun_adduser.html | 2 +- main/Makefile.dep | 24 +- main/main.cpp | 42 +++- notify/Makefile.dep | 25 ++- plugins/gallery/Makefile.dep | 68 +++--- plugins/groupitem/Makefile.dep | 57 ++--- plugins/stats/Makefile.dep | 70 +++--- plugins/thread/Makefile.dep | 144 ++++++------ plugins/ticket/Makefile.dep | 171 ++++++++------- templates/Makefile.dep | 175 +++++++-------- 33 files changed, 2022 insertions(+), 583 deletions(-) create mode 100755 core/crypt.cpp create mode 100755 core/crypt.h create mode 100755 core/run.cpp create mode 100755 core/run.h diff --git a/core/Makefile.dep b/core/Makefile.dep index b108075..97e857a 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -17,7 +17,7 @@ app.o: ../templates/htmltextstream.h ../notify/notifythread.h app.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h app.o: ../core/config.h ../core/users.h user.h ugcontainer.h lastcontainer.h app.o: cur.h session.h plugindata.h rebus.h mounts.h mount.h mountparser.h -app.o: users.h groups.h group.h loadavg.h thumb.h basethread.h +app.o: crypt.h run.h users.h groups.h group.h loadavg.h thumb.h basethread.h app.o: sessionmanager.h sessioncontainer.h ../functions/functions.h app.o: ../functions/functionbase.h ../core/request.h ../core/system.h app.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h @@ -28,16 +28,16 @@ app.o: ../functions/download.h ../functions/emacs.h ../functions/last.h app.o: ../functions/login.h ../functions/logout.h ../functions/ln.h app.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h app.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -app.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h -app.o: ../functions/stat.h ../functions/subject.h ../functions/template.h -app.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h -app.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h -app.o: ../core/htmlfilter.h ../templates/templates.h -app.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -app.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -app.o: ../core/sessionmanager.h compress.h getparser.h httpsimpleparser.h -app.o: postparser.h cookieparser.h postmultiparser.h acceptencodingparser.h -app.o: acceptbaseparser.h plugin.h pluginmsg.h +app.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h +app.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h +app.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h +app.o: ../templates/templates.h ../templates/patterncacher.h +app.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +app.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +app.o: compress.h getparser.h httpsimpleparser.h postparser.h cookieparser.h +app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h plugin.h +app.o: pluginmsg.h basethread.o: basethread.h log.h textstream.h bbcodeparser.o: bbcodeparser.h htmlfilter.h compress.o: compress.h log.h textstream.h @@ -57,8 +57,8 @@ config.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h config.o: ../notify/notifythread.h ../core/basethread.h synchro.h config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h user.h config.o: ugcontainer.h lastcontainer.h cur.h session.h rebus.h mounts.h -config.o: mount.h mountparser.h users.h groups.h group.h loadavg.h thumb.h -config.o: basethread.h sessionmanager.h sessioncontainer.h +config.o: mount.h mountparser.h crypt.h run.h users.h groups.h group.h +config.o: loadavg.h thumb.h basethread.h sessionmanager.h sessioncontainer.h config.o: ../functions/functions.h ../functions/functionbase.h config.o: ../core/request.h ../core/system.h ../core/synchro.h config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h @@ -68,7 +68,7 @@ config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h config.o: ../functions/last.h ../functions/login.h ../functions/logout.h config.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h config.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -config.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +config.o: ../functions/reload.h ../functions/rm.h config.o: ../functions/specialdefault.h ../functions/stat.h config.o: ../functions/subject.h ../functions/template.h config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h @@ -78,6 +78,8 @@ config.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h config.o: ../core/httpsimpleparser.h ../core/log.h config.o: ../templates/indexpatterns.h ../core/sessionmanager.h confparser.o: confparser.h misc.h item.h ../../ezc/src/utf8.h +crypt.o: crypt.h run.h config.h confparser.h htmlfilter.h user.h +crypt.o: ../../ezc/src/utf8.h misc.h item.h log.h textstream.h dircontainer.o: dircontainer.h item.h log.h textstream.h dirs.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h dirs.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h @@ -156,19 +158,19 @@ mounts.o: ../templates/htmltextstream.h ../notify/notifythread.h mounts.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h mounts.o: ../core/config.h ../core/users.h user.h ugcontainer.h mounts.o: lastcontainer.h cur.h session.h plugindata.h rebus.h mountparser.h -mounts.o: plugin.h pluginmsg.h system.h users.h groups.h group.h loadavg.h -mounts.o: thumb.h basethread.h sessionmanager.h sessioncontainer.h -mounts.o: ../functions/functions.h ../functions/functionbase.h -mounts.o: ../core/request.h ../core/system.h ../core/synchro.h -mounts.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h -mounts.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -mounts.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -mounts.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -mounts.o: ../functions/last.h ../functions/login.h ../functions/logout.h -mounts.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -mounts.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -mounts.o: ../functions/reload.h ../functions/rm.h ../functions/run.h -mounts.o: ../functions/specialdefault.h ../functions/stat.h +mounts.o: plugin.h pluginmsg.h system.h crypt.h run.h users.h groups.h +mounts.o: group.h loadavg.h thumb.h basethread.h sessionmanager.h +mounts.o: sessioncontainer.h ../functions/functions.h +mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h +mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +mounts.o: ../functions/privchanger.h ../functions/chown.h +mounts.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +mounts.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +mounts.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +mounts.o: ../functions/node.h ../functions/priv.h ../functions/reload.h +mounts.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h mounts.o: ../functions/subject.h ../functions/template.h mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h mounts.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h @@ -192,8 +194,8 @@ plugin.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h plugin.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h user.h plugin.o: ugcontainer.h lastcontainer.h cur.h session.h rebus.h mounts.h -plugin.o: mount.h mountparser.h users.h groups.h group.h loadavg.h thumb.h -plugin.o: basethread.h sessionmanager.h sessioncontainer.h +plugin.o: mount.h mountparser.h crypt.h run.h users.h groups.h group.h +plugin.o: loadavg.h thumb.h basethread.h sessionmanager.h sessioncontainer.h plugin.o: ../functions/functions.h ../functions/functionbase.h plugin.o: ../core/request.h ../core/system.h ../core/synchro.h plugin.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h @@ -203,7 +205,7 @@ plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h plugin.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h plugin.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -plugin.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +plugin.o: ../functions/reload.h ../functions/rm.h plugin.o: ../functions/specialdefault.h ../functions/stat.h plugin.o: ../functions/subject.h ../functions/template.h plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h @@ -229,8 +231,8 @@ plugindata.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h plugindata.o: user.h ugcontainer.h lastcontainer.h cur.h session.h rebus.h -plugindata.o: mounts.h mount.h mountparser.h users.h groups.h group.h -plugindata.o: loadavg.h thumb.h basethread.h sessionmanager.h +plugindata.o: mounts.h mount.h mountparser.h crypt.h run.h users.h groups.h +plugindata.o: group.h loadavg.h thumb.h basethread.h sessionmanager.h plugindata.o: sessioncontainer.h ../functions/functions.h plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h plugindata.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h @@ -242,15 +244,15 @@ plugindata.o: ../functions/emacs.h ../functions/last.h ../functions/login.h plugindata.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h plugindata.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h plugindata.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -plugindata.o: ../functions/run.h ../functions/specialdefault.h -plugindata.o: ../functions/stat.h ../functions/subject.h -plugindata.o: ../functions/template.h ../functions/tinymce.h -plugindata.o: ../functions/uname.h ../functions/upload.h -plugindata.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h -plugindata.o: ../core/htmlfilter.h ../templates/templates.h -plugindata.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -plugindata.o: ../core/httpsimpleparser.h ../core/log.h -plugindata.o: ../templates/indexpatterns.h ../core/sessionmanager.h +plugindata.o: ../functions/specialdefault.h ../functions/stat.h +plugindata.o: ../functions/subject.h ../functions/template.h +plugindata.o: ../functions/tinymce.h ../functions/uname.h +plugindata.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h +plugindata.o: ../functions/vim.h ../core/htmlfilter.h +plugindata.o: ../templates/templates.h ../templates/patterncacher.h +plugindata.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +plugindata.o: ../core/log.h ../templates/indexpatterns.h +plugindata.o: ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: confparser.h htmlfilter.h log.h textstream.h postmultiparser.o: ../../ezc/src/utf8.h misc.h item.h @@ -275,8 +277,8 @@ request.o: ../templates/htmltextstream.h ../notify/notifythread.h request.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h request.o: ../core/config.h ../core/users.h user.h ugcontainer.h request.o: lastcontainer.h cur.h session.h rebus.h mounts.h mount.h -request.o: mountparser.h users.h groups.h group.h loadavg.h thumb.h -request.o: basethread.h sessionmanager.h sessioncontainer.h +request.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h +request.o: thumb.h basethread.h sessionmanager.h sessioncontainer.h request.o: ../functions/functions.h ../functions/functionbase.h request.o: ../core/request.h ../core/system.h ../core/synchro.h request.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h @@ -287,14 +289,15 @@ request.o: ../functions/emacs.h ../functions/last.h ../functions/login.h request.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h request.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -request.o: ../functions/run.h ../functions/specialdefault.h -request.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +request.o: ../functions/specialdefault.h ../functions/stat.h +request.o: ../functions/subject.h ../functions/template.h request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h request.o: ../core/htmlfilter.h ../templates/templates.h request.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h request.o: ../core/httpsimpleparser.h ../core/log.h request.o: ../templates/indexpatterns.h ../core/sessionmanager.h +run.o: run.h log.h textstream.h session.o: session.h item.h error.h user.h plugindata.h rebus.h misc.h sessioncontainer.o: sessioncontainer.h session.h item.h error.h user.h sessioncontainer.o: plugindata.h rebus.h cur.h request.h requesttypes.h @@ -321,10 +324,11 @@ sessionmanager.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h sessionmanager.o: ../notify/notifythread.h ../core/basethread.h synchro.h sessionmanager.o: ../notify/templatesnotify.h ../core/config.h sessionmanager.o: ../core/users.h ugcontainer.h mounts.h mount.h -sessionmanager.o: mountparser.h users.h groups.h group.h loadavg.h thumb.h -sessionmanager.o: basethread.h sessionparser.h plugin.h pluginmsg.h -sessionmanager.o: ../functions/functions.h ../functions/functionbase.h -sessionmanager.o: ../core/request.h ../core/system.h ../core/synchro.h +sessionmanager.o: mountparser.h crypt.h run.h users.h groups.h group.h +sessionmanager.o: loadavg.h thumb.h basethread.h sessionparser.h plugin.h +sessionmanager.o: pluginmsg.h ../functions/functions.h +sessionmanager.o: ../functions/functionbase.h ../core/request.h +sessionmanager.o: ../core/system.h ../core/synchro.h sessionmanager.o: ../functions/functionparser.h ../core/cur.h sessionmanager.o: ../functions/adduser.h ../functions/cat.h sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h @@ -335,13 +339,12 @@ sessionmanager.o: ../functions/last.h ../functions/login.h sessionmanager.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h sessionmanager.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h sessionmanager.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -sessionmanager.o: ../functions/run.h ../functions/specialdefault.h -sessionmanager.o: ../functions/stat.h ../functions/subject.h -sessionmanager.o: ../functions/template.h ../functions/tinymce.h -sessionmanager.o: ../functions/uname.h ../functions/upload.h -sessionmanager.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h -sessionmanager.o: ../core/htmlfilter.h ../templates/templates.h -sessionmanager.o: ../templates/patterncacher.h +sessionmanager.o: ../functions/specialdefault.h ../functions/stat.h +sessionmanager.o: ../functions/subject.h ../functions/template.h +sessionmanager.o: ../functions/tinymce.h ../functions/uname.h +sessionmanager.o: ../functions/upload.h ../functions/uptime.h +sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h +sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h sessionmanager.o: ../core/log.h ../templates/indexpatterns.h sessionmanager.o: ../core/sessionmanager.h @@ -367,8 +370,8 @@ system.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h system.o: ../notify/notifythread.h ../core/basethread.h synchro.h system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h user.h system.o: ugcontainer.h lastcontainer.h cur.h session.h plugindata.h rebus.h -system.o: mounts.h mount.h mountparser.h users.h groups.h group.h loadavg.h -system.o: thumb.h basethread.h ../templates/templates.h +system.o: mounts.h mount.h mountparser.h crypt.h run.h users.h groups.h +system.o: group.h loadavg.h thumb.h basethread.h ../templates/templates.h system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h system.o: ../core/httpsimpleparser.h ../core/log.h system.o: ../templates/indexpatterns.h ../core/cur.h ../core/system.h @@ -391,6 +394,6 @@ thumb.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h thumb.o: ../templates/htmltextstream.h ../notify/notifythread.h thumb.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h thumb.o: ../core/users.h user.h ugcontainer.h lastcontainer.h cur.h session.h -thumb.o: plugindata.h rebus.h mounts.h mount.h mountparser.h users.h groups.h -thumb.o: group.h loadavg.h +thumb.o: plugindata.h rebus.h mounts.h mount.h mountparser.h crypt.h run.h +thumb.o: users.h groups.h group.h loadavg.h users.o: users.h diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep index 6628b6b..c4d3619 100755 --- a/core/Makefile.o.dep +++ b/core/Makefile.o.dep @@ -1 +1 @@ -o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o confparser.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o item.o lastcontainer.o loadavg.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o session.o sessioncontainer.o sessionmanager.o sessionparser.o synchro.o system.o textstream.o thumb.o users.o +o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o confparser.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o item.o lastcontainer.o loadavg.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o synchro.o system.o textstream.o thumb.o users.o diff --git a/core/config.cpp b/core/config.cpp index 840f3ba..e3c9f65 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -11,6 +11,7 @@ #include "log.h" #include "plugin.h" #include "misc.h" +#include "crypt.h" @@ -174,7 +175,6 @@ void Config::AssignValues(bool stdout_is_closed) title_separator = Text(L"title_separator", L" / "); http_header_send_file = Text(L"http_header_send_file", L"X-LIGHTTPD-send-file"); - password_min_size = Size(L"password_min_size", 5); debug_info = Bool(L"debug_info", false); editors_html_safe_mode = Bool(L"editors_html_safe_mode", true); @@ -191,6 +191,15 @@ void Config::AssignValues(bool stdout_is_closed) symlinks_follow_max = Size(L"symlinks_follow_max", 20); ticket_form_prefix = Text(L"ticket_form_prefix", L"ticketparam"); + + pass_min_size = Size(L"pass_min_size", 5); + pass_type = Int(L"pass_type", 12); + pass_hash_use_salt = Bool(L"pass_hash_use_salt", false); + pass_hash_salt = Text(L"pass_hash_salt"); + pass_use_rsa = Bool(L"pass_use_rsa", false); + pass_rsa_private_key = Text(L"pass_rsa_private_key"); + + opensll_path = Text(L"opensll_path", L"/usr/bin/openssl"); } @@ -207,6 +216,7 @@ void Config::SetAdditionalVariables() html_filter_orphans_mode = HTMLFilter::orphan_nbsp; CheckLocale(); + CheckPasswd(); } @@ -240,6 +250,26 @@ bool found = false; } +void Config::CheckPasswd() +{ + switch(pass_type) + { + case WINIX_CRYPT_HASH_PLAIN: + case WINIX_CRYPT_HASH_MD4: + case WINIX_CRYPT_HASH_MD5: + case WINIX_CRYPT_HASH_SHA1: + case WINIX_CRYPT_HASH_SHA224: + case WINIX_CRYPT_HASH_SHA256: + case WINIX_CRYPT_HASH_SHA384: + case WINIX_CRYPT_HASH_SHA512: + break; + + default: + pass_type = WINIX_CRYPT_HASH_SHA256; + } +} + + void Config::SetHttpHost(const std::wstring & in, std::wstring & out) { const char http[] = "http://"; diff --git a/core/config.h b/core/config.h index 05671ff..46d28ca 100755 --- a/core/config.h +++ b/core/config.h @@ -279,10 +279,6 @@ public: // default: X-LIGHTTPD-send-file std::wstring http_header_send_file; - // the minimum size of a password for new users (function: adduser) - // default: 5 - size_t password_min_size; - // prints additional information (in the end of the html page as a commentary) bool debug_info; @@ -319,6 +315,48 @@ public: // default: ticketparam std::wstring ticket_form_prefix; + // the minimal size of a user's password + // default: 5 + size_t pass_min_size; + + // how passwords should be stored + // 0 - plain text + // 1 - md4 hash + // 2 - md5 hash + // 10 - sha1 hash + // 11 - sha224 hash + // 12 - sha256 hash (default) + // 13 - sha384 hash + // 14 - sha512 hash + int pass_type; + + // whether the passwords' hashes should be salted or not + // this affects newly created accounts + // default: false + bool pass_hash_use_salt; + + // salt to a password's hash + // default empty + // !! once you set this salt don't change it any more (people wouldn't be allowed to login) + std::wstring pass_hash_salt; + + // whether the passwords' hashes should be encrypted + // this affects newly created accounts + // default: false + bool pass_use_rsa; + + // path to a RSA private key + // this is actually private + public key in one file + // generated by "openssl genrsa" + // default empty which means encryption will not be used + // !! once you set these keys don't change it any more (people wouldn't be allowed to login) + std::wstring pass_rsa_private_key; + + + // path to 'openssl' + // default: /usr/bin/openssl + std::wstring opensll_path; + /* */ @@ -359,6 +397,7 @@ private: void SetHttpHost(const std::wstring & in, std::wstring & out); void SetAdditionalVariables(); void CheckLocale(); + void CheckPasswd(); ConfParser parser; diff --git a/core/crypt.cpp b/core/crypt.cpp new file mode 100755 index 0000000..507b626 --- /dev/null +++ b/core/crypt.cpp @@ -0,0 +1,273 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#include +#include "crypt.h" +#include "utf8.h" +#include "misc.h" +#include "log.h" + + + +void Crypt::SetConfig(Config * pconfig) +{ + config = pconfig; +} + + +void Crypt::TrimLastWhite(std::string & str) +{ + if( str.empty() ) + return; + + size_t i = str.size(); + + while( i > 0 && (IsWhite(str[i-1]) || str[i-1]==10) ) + i -= 1; + + if( i < str.size() ) + str.erase(i); +} + + +bool Crypt::Hash(int hash, const char * in, size_t inlen, std::string & out) +{ + out.clear(); + + if( !config ) + return false; + + run.Clear(); + Ezc::WideToUTF8(config->opensll_path, command); + run.Cmd(command); + run.Par("dgst"); + + switch(hash) + { + case WINIX_CRYPT_HASH_MD4: run.Par("-md4"); break; + case WINIX_CRYPT_HASH_MD5: run.Par("-md5"); break; + case WINIX_CRYPT_HASH_SHA1: run.Par("-sha1"); break; + case WINIX_CRYPT_HASH_SHA224: run.Par("-sha224"); break; + case WINIX_CRYPT_HASH_SHA256: run.Par("-sha256"); break; + case WINIX_CRYPT_HASH_SHA384: run.Par("-sha384"); break; + case WINIX_CRYPT_HASH_SHA512: run.Par("-sha512"); break; + + default: + return false; + } + + bool result = run.Go(in, inlen, out) == 0; + TrimLastWhite(out); + +return result; +} + + + +bool Crypt::Hash(int hash, const char * in, std::string & out) +{ + size_t len = strlen(in); + return Hash(hash, in, len, out); +} + + + +bool Crypt::Hash(int hash, const std::string & in, std::string & out) +{ + return Hash(hash, in.c_str(), in.size(), out); +} + + + +bool Crypt::Hash(int hash, const wchar_t * in, size_t inlen, std::wstring & out) +{ + Ezc::WideToUTF8(in, inlen, bufina); + int res = Hash(hash, bufina.c_str(), bufina.size(), bufouta); + + // the output hash is not a UTF8 string + // it consists only from ascii letters + AssignString(bufouta, out); + +return res; +} + + +bool Crypt::Hash(int hash, const wchar_t * in, std::wstring & out) +{ + size_t len = wcslen(in); + return Hash(hash, in, len, out); + +} + +bool Crypt::Hash(int hash, const std::wstring & in, std::wstring & out) +{ + return Hash(hash, in.c_str(), in.size(), out); +} + + +bool IsAllWhite(const char * str) +{ + for( ; *str ; ++str) + { + if( !(IsWhite(*str) || *str==10) ) + return false; + } + +return true; +} + + + +bool Crypt::RSA(bool encrypt, const char * keypath, const char * in, size_t inlen, std::string & out) +{ + out.clear(); + + if( !config || IsAllWhite(keypath) ) + return false; + + run.Clear(); + Ezc::WideToUTF8(config->opensll_path, command); + run.Cmd(command); + + run.Par("rsautl"); + run.Par("-inkey"); + run.Par(keypath); + + if(encrypt) + run.Par("-encrypt"); + else + run.Par("-decrypt"); + +return run.Go(in, inlen, out) == 0; +} + + + +bool Crypt::RSA(bool encrypt, const char * keypath, const std::string & in, std::string & out) +{ + return RSA(encrypt, keypath, in.c_str(), in.size(), out); +} + + +bool Crypt::RSA(bool encrypt, const std::string & keypath, const std::string & in, std::string & out) +{ + return RSA(encrypt, keypath.c_str(), in.c_str(), in.size(), out); +} + + + +bool Crypt::RSA(bool encrypt, const wchar_t * keypath, const char * in, size_t inlen, std::string & out) +{ + Ezc::WideToUTF8(keypath, keypatha); + return RSA(encrypt, keypatha.c_str(), in, inlen, out); +} + + + +bool Crypt::RSA(bool encrypt, const wchar_t * keypath, const std::string & in, std::string & out) +{ + return RSA(encrypt, keypath, in.c_str(), in.size(), out); +} + + +bool Crypt::RSA(bool encrypt, const std::wstring & keypath, const std::string & in, std::string & out) +{ + return RSA(encrypt, keypath.c_str(), in.c_str(), in.size(), out); +} + + + + + + + + +bool Crypt::PassHash(const std::wstring & salt, UserPass & up) +{ + bool result = true; + up.pass_hash_salted = false; + + if( up.pass_type != WINIX_CRYPT_HASH_PLAIN ) + { + pass_org = up.pass; + pass_salted = up.pass; + pass_salted += salt; + + if( Hash(up.pass_type, pass_salted, up.pass) ) + { + if( !salt.empty() ) + up.pass_hash_salted = true; + } + else + { + log << log1 << "Crypt: problem with generating a hash, the password will not be hashed" << logend; + + up.pass = pass_org; + up.pass_type = WINIX_CRYPT_HASH_PLAIN; + result = false; + } + + ClearString(pass_salted); + ClearString(pass_org); + } + +return result; +} + + + +bool Crypt::PassCrypt(const std::wstring & path_to_rsa_private_key, UserPass & up) +{ + bool result = false; + ClearString(up.pass_encrypted); + + if( !path_to_rsa_private_key.empty() ) + { + Ezc::WideToUTF8(up.pass, passa); + + if( RSA(true, path_to_rsa_private_key, passa, up.pass_encrypted) ) + { + result = true; + } + else + { + ClearString(up.pass_encrypted); + log << log1 << "AddUser: problem with encrypting, the password will not be encrypted!" << logend; + } + + ClearString(passa); + } + +return result; +} + + +void Crypt::PassHashCrypt(const std::wstring & salt, const std::wstring & path_to_rsa_private_key, UserPass & up) +{ + PassHash(salt, up); + PassCrypt(path_to_rsa_private_key, up); +} + + + +void Crypt::PassHashCrypt(UserPass & up) +{ + up.pass_type = config->pass_type; + empty.clear(); + + if( config->pass_hash_use_salt && !config->pass_hash_salt.empty() ) + PassHash(config->pass_hash_salt, up); + else + PassHash(empty, up); + + + if( config->pass_use_rsa && !config->pass_rsa_private_key.empty() ) + PassCrypt(config->pass_rsa_private_key, up); +} + diff --git a/core/crypt.h b/core/crypt.h new file mode 100755 index 0000000..32ecdde --- /dev/null +++ b/core/crypt.h @@ -0,0 +1,209 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_core_crypt +#define headerfile_winix_core_crypt + + +#include +#include "run.h" +#include "config.h" +#include "user.h" + + +/* + the kind of hashes we are able to obtain in winix +*/ +#define WINIX_CRYPT_HASH_PLAIN 0 +#define WINIX_CRYPT_HASH_MD4 1 +#define WINIX_CRYPT_HASH_MD5 2 +#define WINIX_CRYPT_HASH_SHA1 10 +#define WINIX_CRYPT_HASH_SHA224 11 +#define WINIX_CRYPT_HASH_SHA256 12 +#define WINIX_CRYPT_HASH_SHA384 13 +#define WINIX_CRYPT_HASH_SHA512 14 + + + +/* + calculating hashes, encrypting and decrypting with RSA +*/ +class Crypt +{ +public: + + + void SetConfig(Config * pconfig); + + + /* + calculating a hash from a given input + + input: + hash - the kind of the hash - WINIX_CRYPT_HASH_* + in - input buffer + inlen - the length of the buffer + output: + out - the hash + */ + bool Hash(int hash, const char * in, size_t inlen, std::string & out); + bool Hash(int hash, const char * in, std::string & out); + bool Hash(int hash, const std::string & in, std::string & out); + + + /* + calculating a hash from a given input + the input string is first changed to UTF8 and then hash is calculated + + input: + hash - the kind of the hash - WINIX_CRYPT_HASH_* + in - input buffer + inlen - the length of the buffer + output: + out - the hash + */ + bool Hash(int hash, const wchar_t * in, size_t inlen, std::wstring & out); + bool Hash(int hash, const wchar_t * in, std::wstring & out); + bool Hash(int hash, const std::wstring & in, std::wstring & out); + + + /* + encrypt/decrypt by using RSA algorithm + + input: + encrypt - true means encrypting, false means decrypting + keypath - path to a RSA private key (this is a private and public key in one file) + in - input buffer + inlen - the size of the buffer + + output: + out - encrypted or decrypted buffer + */ + bool RSA(bool encrypt, const char * keypath, const char * in, size_t inlen, std::string & out); + bool RSA(bool encrypt, const char * keypath, const std::string & in, std::string & out); + bool RSA(bool encrypt, const std::string & keypath, const std::string & in, std::string & out); + bool RSA(bool encrypt, const wchar_t * keypath, const char * in, size_t inlen, std::string & out); + bool RSA(bool encrypt, const wchar_t * keypath, const std::string & in, std::string & out); + bool RSA(bool encrypt, const std::wstring & keypath, const std::string & in, std::string & out); + + + /* + this method creates a hash from the given plain text password + + input. + salt - salt for the hash + up.pass_type - what kind of hash do you want - look at WINIX_CRYPT_HASH_* macros (in crypt.h) + up.pass - plain text password + + if salt is empty then the hash will not be salted + + output: + up.pass_type - (can be changed to 0 when there is a problem with generating a hash) + up.pass - hash from the password (or plain text if up.pass_type was zero) + up.pass_hash_salted (true if the hash is salted - when salt was not empty) + + if there is a problem with generating a hash the method stores a plain text password + and changes up.pass_type to zero (plain text passwords are not salted) + */ + bool PassHash(const std::wstring & salt, UserPass & up); + + + /* + this method encrypts the given password + + input: + path_to_rsa_private_key - a path to rsa private key (this are a private and public keys both in one file) + up.pass - given password (can be a plain text or a hash) + + if path_to_rsa_private_key is empty then the password will not be encrypted + + output: + up.pass_encrypted + + if there is a problem (or the path to the key is empty) then up.pass_encrypted will be empty + and the method returns false + */ + bool PassCrypt(const std::wstring & path_to_rsa_private_key, UserPass & up); + + + /* + this method creates a hash from the given plain text password and then encrypts it + + input: + salt - salt for the hash + path_to_rsa_private_key - a path to rsa private key (this are a private and public keys both in one file) + up.pass_type - what kind of hash do you want - look at WINIX_CRYPT_HASH_* macros (in crypt.h) + up.pass - plain text password + + if salt is empty then the hash will not be salted + if path_to_rsa_private_key is empty then the password will not be encrypted + + output: + up.pass_type - (can be changed to 0 when there is a problem with generating a hash) + up.pass - hash from the password (or plain text if up.pass_type was zero) + up.pass_hash_salted (true if the hash is salted - when salt was not empty) + up.pass_encrypted - encrypted password (if not empty) + + */ + void PassHashCrypt(const std::wstring & salt, const std::wstring & path_to_rsa_private_key, UserPass & up); + + + /* + this method creates a hash from the given plain text password and then encrypts it + + input: + up.pass - plain text password + + output: + up.pass_type - what kind of hash there is in up.pass + up.pass - hash from the password (or plain text if up.pass_type is zero) + up.pass_hash_salted - true if the hash is salted (plain text are never salted) + up.pass_encrypted - encrypted password (if not empty) + */ + void PassHashCrypt(UserPass & up); + + + /* + putting some characters into the string and then calling clear() + */ + template + void ClearString(StringType & str); + + + +private: + + void TrimLastWhite(std::string & str); + + Config * config; + Run run; + std::string command, bufina, bufouta, keypatha; + //std::wstring pass_salted;//, pass_hashed; + //std::string pass_hasheda, pass_encrypteda; + + std::wstring pass_salted, pass_org; + std::string passa; + std::wstring empty; +}; + + + +template +void Crypt::ClearString(StringType & str) +{ + for(size_t i=0 ; i +#include +#include +#include +#include "run.h" +#include "log.h" + + + + +Run::Run() +{ + Clear(); +} + + + +void Run::Clear() +{ + parlen = 0; + envlen = 0; + command = 0; + last_status = 0; + last_return = 255; +} + + + +void Run::SetName() +{ + size_t i=0; + + while( command[i] ) + i += 1; + + while( i>0 && command[i-1]!='/' ) + i -= 1; + + par[0] = const_cast(command + i); +} + + + +void Run::Par(const char * p) +{ + if( parlen < WINIX_RUN_MAX_PARAMETERS ) + { + // they will be copied (fork) + // the first (zero) parameter is a program name + par[1 + parlen++] = const_cast(p); + } +} + + + +void Run::Env(const char * e) +{ + if( envlen < WINIX_RUN_MAX_PARAMETERS ) + { + // they will be copied (fork) + env[envlen++] = const_cast(e); + } +} + + + +void Run::Cmd(const char * c) +{ + command = c; + SetName(); +} + + + +void Run::Par(const std::string & p) +{ + Par(p.c_str()); +} + + + +void Run::Env(const std::string & e) +{ + Env(e.c_str()); +} + + + +void Run::Cmd(const std::string & c) +{ + Cmd(c.c_str()); +} + + + + +int Run::LastStatus() +{ + return last_status; +} + + + +int Run::LastReturn() +{ + return last_return; +} + + + +void Run::Write(const char * in, size_t inlen) +{ +ssize_t len; + + while( inlen > 0 ) + { + len = write(desout[1], in, inlen); + + if( len < 0 || len > (ssize_t)inlen ) + { + // something wrong + last_status = 3; + break; + } + + in += len; + inlen -= len; + } +} + + + +void Run::Read(std::string & out) +{ +char buf[1024]; +size_t buflen = sizeof(buf) / sizeof(char); +ssize_t len; + + do + { + len = read(desin[0], buf, buflen); + + if( len < 0 || len > (ssize_t)buflen ) + { + // something wrong + last_status = 4; + break; + } + + if( len > 0 ) + out.append(buf, len); + } + while( len > 0 ); +} + + + +void Run::ChildThrow() +{ + if( dup2(desout[0], 0) == -1 ) + return; + + if( dup2(desin[1], 1) == -1 ) + return; + + close(2); + close(desin[0]); + close(desout[1]); + + par[parlen+1] = 0; + env[envlen] = 0; + + execve(command, par, env); + // if we are here then there is something wrong (execve failed) +} + + + +void Run::Child() +{ + try + { + ChildThrow(); + } + catch(...) + { + } + + exit(255); +} + + + +bool Run::CreatePipes() +{ + int res = pipe(desin); + + if( res != 0 ) + { + log << log1 << "Run: pipe failed (desin)" << logend; + last_status = 1; + return false; + } + + res = pipe(desout); + + if( res != 0 ) + { + log << log1 << "Run: pipe failed (desout)" << logend; + last_status = 1; + close(desin[0]); + close(desin[1]); + return false; + } + +return true; +} + + + +bool Run::Fork() +{ + childpid = fork(); + + if( childpid == -1 ) + { + log << log1 << "Run: fork failed" << logend; + last_status = 2; + close(desin[0]); + close(desin[1]); + close(desout[0]); + close(desout[1]); + return false; + } + + if( childpid == 0 ) + Child(); + +return true; +} + + + +void Run::WriteRead(const char * in, size_t inlen, std::string * out) +{ + if( in && inlen>0 ) + Write(in, inlen); + + close(desout[1]); + + if( out ) + Read(*out); + + close(desin[0]); +} + + + +void Run::CheckStatus() +{ +int status; + + pid_t res = waitpid(childpid, &status, 0); + + if( res == -1 ) + { + log << log1 << "Run: waitpid failed" << logend; + last_status = 6; + } + else + { + if( WIFEXITED(status) ) + { + last_return = WEXITSTATUS(status); + } + else + { + if( WIFCONTINUED(status) ) + log << log1 << "Run: child error: WIFCONTINUED" << logend; + else + if( WIFSIGNALED(status) ) + log << log1 << "Run: child error: WIFSIGNALED" << logend; + else + if( WIFSTOPPED(status) ) + log << log1 << "Run: child error: WIFSTOPPED" << logend; + + last_status = 5; + } + } +} + + + +int Run::Go(const char * in, size_t inlen, std::string * out) +{ + last_status = 0; + last_return = 255; + + if( out ) + out->clear(); + + if( !command ) + { + last_status = 7; + return last_return; + } + + if( !CreatePipes() ) + return last_return; + + if( !Fork() ) + return last_return; + + // here goes the parent + close(desin[1]); + close(desout[0]); + WriteRead(in, inlen, out); + CheckStatus(); + + if( last_status != 0 ) + log << log1 << "Run: a problem with the command, last_status: " << last_status << logend; + +return last_return; +} + + +int Run::Go(const char * in, size_t inlen, std::string & out) +{ + return Go(in, inlen, &out); +} + + +int Run::Go(const char * in, std::string & out) +{ + size_t len = strlen(in); + return Go(in, len, &out); +} + + +int Run::Go(const char * in, size_t inlen) +{ + return Go(in, inlen, 0); +} + + +int Run::Go(const char * in) +{ + size_t len = strlen(in); + return Go(in, len, 0); +} + + +int Run::Go() +{ + return Go(0, 0, 0); +} + + +int Run::Go(const std::string in, std::string & out) +{ + return Go(in.c_str(), in.size(), &out); +} + + +int Run::Go(const std::string in) +{ + return Go(in.c_str(), in.size(), 0); +} + + +int Run::Go(std::string & out) +{ + return Go(0, 0, &out); +} + + diff --git a/core/run.h b/core/run.h new file mode 100755 index 0000000..6a47a28 --- /dev/null +++ b/core/run.h @@ -0,0 +1,163 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_core_run +#define headerfile_winix_core_run + +#include +#include + + +/* + how many parameters and environment variables can be passed to a program +*/ +#define WINIX_RUN_MAX_PARAMETERS 30 + + +/* + objects of this class allows you to run an external program + + when you call Go() then: + 1. winix creates pipes for communicating with a child process + 2. then winix fork() + 3. the child process execve() the specified command + 4. winix (parent) sends 'in' to the standard input of the child process + 5. after sending it closes the descriptor so the child sees it as end-of-file + 6. now winix reads what the child sends to standard output (until EOF) + 7. winix waitpid() for the child + 8. Go() returns +*/ +class Run +{ +public: + + Run(); + + + /* + clearing parameters, environment variables and the command + (and clearing LastStatus and LastResult) + so you can call another different program now + */ + void Clear(); + + + /* + setting parameters + each parameter should be passed in different call to Par() method + sample: + if you want to call from your shell: + $ myprog -a -b -f "test file" + you should call Par() in this way: + Par("-a"); + Par("-b"); + Par("test file"); // apostrophes are not needed here + + arguments passed to Par() should not be changed afterwards, this method does not copy them anywhere + it uses only the pointer + */ + void Par(const char * p); + void Par(const std::string & p); + + + /* + setting environment variables + one variable per one Env() call + + arguments passed to Env() should not be changed afterwards, this method does not copy them anywhere + it uses only the pointer + */ + void Env(const char * e); + void Env(const std::string & e); + + + /* + full path to command you want to execute + + arguments passed to Cmd() should not be changed afterwards, this method does not copy them anywhere + it uses only the pointer + */ + void Cmd(const char * c); + void Cmd(const std::string & c); + + + /* + executing the command + you should call Par(), Env() and Cmd() beforehand + */ + int Go(const char * in, size_t inlen, std::string & out); + int Go(const char * in, std::string & out); + int Go(const char * in, size_t inlen); + int Go(const char * in); + int Go(const std::string in, std::string & out); + int Go(const std::string in); + int Go(std::string & out); + int Go(); + + + /* + last status: + 0 - ok (program was successfully called) + 1 - pipe failed + 2 - fork failed + 3 - write failed + 4 - read failed + 5 - child process has done something wrong (caught a signal etc.) + 6 - waitpid failed + 7 - the command is not set (call Cmd method first) + */ + int LastStatus(); + + + /* + the code which the command returned (usually "0" means no errors found) + if LastStatus is different from zero then LastReturn always returns 255 + (so you don't have to check LastStatus() first) + */ + int LastReturn(); + + + +private: + + int Go(const char * in, size_t inlen, std::string * out); + void SetName(); + void CheckStatus(); + void WriteRead(const char * in, size_t inlen, std::string * out); + bool CreatePipes(); + bool Fork(); + void ChildThrow(); + void Child(); + void Write(const char * in, size_t inlen); + void Read(std::string & out); + + + int last_status; + + // the return code returned by a program (if last_status==0) + // if last_status!=0 then last_return is 255 + int last_return; + + int desin[2]; + int desout[2]; + + char * par[WINIX_RUN_MAX_PARAMETERS + 2]; + char * env[WINIX_RUN_MAX_PARAMETERS + 1]; + const char * command; + + size_t parlen; + size_t envlen; + + pid_t childpid; + +}; + + +#endif + diff --git a/core/system.cpp b/core/system.cpp index 4c90641..cb04dff 100755 --- a/core/system.cpp +++ b/core/system.cpp @@ -73,6 +73,8 @@ void System::Init() thumb.SetDb(db); thumb.SetConfig(config); thumb.SetSystem(this); + + crypt.SetConfig(config); } diff --git a/core/system.h b/core/system.h index e20d50e..112e8c0 100755 --- a/core/system.h +++ b/core/system.h @@ -16,6 +16,7 @@ #include "db/db.h" #include "request.h" #include "config.h" +#include "crypt.h" #include "users.h" #include "groups.h" #include "rebus.h" @@ -59,6 +60,8 @@ public: // the time when the winix starts time_t system_start; + // cryptography and hashes + Crypt crypt; void SetCur(Cur * pcur); void SetConfig(Config * pconfig); diff --git a/core/user.h b/core/user.h index 2accfb8..3ac470a 100755 --- a/core/user.h +++ b/core/user.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,20 @@ #include + +/* + a temporary struct used for hashing and encrypting a user's password +*/ +struct UserPass +{ + int pass_type; // the kind of hash (WINIX_CRYPT_HASH_* see crypt.h) + std::wstring pass; // password hashed or plain text if pass_type==0 + std::string pass_encrypted; // password encrypted + bool pass_hash_salted; // true when the hash was salted (plain text passwords are never salted) +}; + + + struct User { long id; diff --git a/core/version.h b/core/version.h index d5dd3a4..af25ea6 100755 --- a/core/version.h +++ b/core/version.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -13,7 +13,7 @@ #define WINIX_VER_MAJOR 0 #define WINIX_VER_MINOR 4 -#define WINIX_VER_REVISION 6 +#define WINIX_VER_REVISION 7 #endif diff --git a/db/db.cpp b/db/db.cpp index 2db3633..191ae4e 100755 --- a/db/db.cpp +++ b/db/db.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -15,18 +15,17 @@ -bool Db::CheckUser(const std::wstring & login, const std::wstring & password, long & user_id) +bool Db::GetUserPass(const std::wstring & login, long & user_id, UserPass & up) { PGresult * r = 0; bool user_ok = false; + user_id = -1; try { query.Clear(); - query << R("select id from core.user where login=") + query << R("select id, password, pass_encrypted, pass_type, pass_hash_salted from core.user where login=") << login - << R(" and password=") - << password << R(";"); r = AssertQuery(query); @@ -39,13 +38,22 @@ bool Db::CheckUser(const std::wstring & login, const std::wstring & password, lo if( rows > 1 ) { - log << log1 << "Db: there is more than one user: " << login << " (with the same password)" << logend; + log << log1 << "Db: there is more than one user: " << login << logend; throw Error(WINIX_ERR_DB_MORE_THAN_ONE_LOGIN); } - int cuser_id = AssertColumn(r, "id"); - user_id = AssertValueLong(r, 0, cuser_id); + int cuser_id = AssertColumn(r, "id"); + int cpass_type = AssertColumn(r, "pass_type"); + int csalted = AssertColumn(r, "pass_hash_salted"); + int cpassword = AssertColumn(r, "password"); + int cpass_encrypted = AssertColumn(r, "pass_encrypted"); + user_ok = true; + user_id = AssertValueLong(r, 0, cuser_id); + up.pass_type = AssertValueInt(r, 0, cpass_type); + up.pass_hash_salted = AssertValueBool(r, 0, csalted); + AssertValueWide(r, 0, cpassword, up.pass); + AssertValueBin(r, 0, cpass_encrypted, up.pass_encrypted); } catch(const Error &) { @@ -60,7 +68,8 @@ return user_ok; -Error Db::AddUser(User & user, const std::wstring & password) +Error Db::AddUser(User & user, const std::wstring & password, const std::string & password_encrypted, + int pass_type, bool pass_hash_salted) { PGresult * r = 0; Error status = WINIX_ERR_OK; @@ -68,12 +77,23 @@ Error Db::AddUser(User & user, const std::wstring & password) try { query.Clear(); - query << R("insert into core.user (login, password, super_user, email, notify) values (") - << user.name - << password - << static_cast(user.super_user) + query << R("insert into core.user (login, password, pass_encrypted, super_user, email," + "notify, pass_type, pass_hash_salted) values (") + << user.name; + + // for safety + if( password_encrypted.empty() ) + query << password; + else + query << ""; + + query.EPutBin(password_encrypted); + + query << user.super_user << user.email << user.notify + << pass_type + << pass_hash_salted << R(");"); r = AssertQuery(query); diff --git a/db/db.h b/db/db.h index 51cb1bc..116c0c8 100755 --- a/db/db.h +++ b/db/db.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -41,8 +41,8 @@ public: - bool CheckUser(const std::wstring & login, const std::wstring & password, long & user_id); - Error AddUser(User & user, const std::wstring & password); + bool GetUserPass(const std::wstring & login, long & user_id, UserPass & up); + Error AddUser(User & user, const std::wstring & password, const std::string & password_encrypted, int pass_type, bool pass_hash_salted); Error AddItem(Item & item); Error EditItemById(Item & item, bool with_url = true); diff --git a/db/dbbase.cpp b/db/dbbase.cpp index bfd504c..93796bd 100755 --- a/db/dbbase.cpp +++ b/db/dbbase.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -151,6 +151,21 @@ return temp_wide_value; } + +void DbBase::AssertValueBin(PGresult * r, int row, int col, std::string & result) +{ + result.clear(); + + const char * res = AssertValue(r, row, col); + int len = PQgetlength(r, row, col); + + if( len <= 0 ) + return; + + UnescapeBin(res, len, result); +} + + void DbBase::AssertValueWide(PGresult * r, int row, int col, std::wstring & result) { const char * res = AssertValue(r, row, col); @@ -172,7 +187,8 @@ int DbBase::AssertValueInt(PGresult * r, int row, int col) bool DbBase::AssertValueBool(PGresult * r, int row, int col) { - return strtol( AssertValue(r, row, col), 0, 10 ) != 0; + const char * s = AssertValue(r, row, col); + return (s[0]=='t' || s[0]=='y' || s[0]=='1'); } @@ -429,3 +445,85 @@ Error DbBase::EndTrans(Error err) return err; } + + + + + +/* + converting from a bytea +*/ + +int DbBase::CharToInt(char c) +{ + return (int)(unsigned char)(c-'0'); +} + +bool DbBase::IsCorrectOctalDigit(char c) +{ + return c>='0' && c<='7'; +} + +// moves 'i' at least once +// return -1 if there is en error +int DbBase::UnescapeBin(const char * str, size_t & i, size_t len) +{ + if( str[i] != '\\' ) + return str[i++]; + + i += 1; + + if( i >= len ) + return -1; + + if( str[i] == '\\' ) + return str[i++]; + + if( i+2 >= len ) + { + i = len; + return -1; + } + + if( !IsCorrectOctalDigit(str[i]) || + !IsCorrectOctalDigit(str[i+1]) || + !IsCorrectOctalDigit(str[i+2]) ) + { + i += 3; + return -1; + } + + int c = 8*8*CharToInt(str[i]) + 8*CharToInt(str[i+1]) + CharToInt(str[i+2]); + + i += 3; + + if( c<0 || c>255 ) + return -1; + +return c; +} + +void DbBase::UnescapeBin(const char * str, size_t len, std::string & out, bool clear_out) +{ +int c; +size_t i = 0; + + if( clear_out ) + out.clear(); + + while( i < len ) + { + c = UnescapeBin(str, i, len); + + if( c != -1 ) + out += c; + } +} + +/* + end of converting from bytea +*/ + + + + diff --git a/db/dbbase.h b/db/dbbase.h index a8af380..48c86b3 100755 --- a/db/dbbase.h +++ b/db/dbbase.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -39,6 +39,7 @@ public: static const char * AssertValue(PGresult * r, int row, int col); static const std::wstring & AssertValueWide(PGresult * r, int row, int col); // warning: this method uses a static buffer static void AssertValueWide(PGresult * r, int row, int col, std::wstring & result); + static void AssertValueBin(PGresult * r, int row, int col, std::string & result); static long AssertValueLong(PGresult * r, int row, int col); static int AssertValueInt(PGresult * r, int row, int col); static bool AssertValueBool(PGresult * r, int row, int col); @@ -65,6 +66,9 @@ public: Error CommitTrans(); Error EndTrans(Error err); + static void UnescapeBin(const char * str, size_t len, std::string & out, bool clear_out = true); + + protected: // a helper method for escaping strings @@ -77,10 +81,14 @@ protected: DbConn * db_conn; bool log_queries; + private: - DbTextStream bquery; + static int CharToInt(char c); + static bool IsCorrectOctalDigit(char c); + static int UnescapeBin(const char * str, size_t & i, size_t len); + DbTextStream bquery; }; diff --git a/db/dbtextstream.cpp b/db/dbtextstream.cpp index 8f7a4bf..4169721 100755 --- a/db/dbtextstream.cpp +++ b/db/dbtextstream.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -111,6 +111,17 @@ DbTextStream & DbTextStream::operator<<(RawText raw) } +DbTextStream & DbTextStream::operator<<(RawText raw) +{ + if( raw.par ) + PutText("true"); + else + PutText("false"); + +return *this; +} + + DbTextStream & DbTextStream::operator<<(RawText raw) { TextStream::operator<<(raw.par); @@ -201,14 +212,13 @@ return *this; */ -// !! sprawdzic jej dzialanie dla kolumn bytea (binarnych) DbTextStream & DbTextStream::EBinPutChar(char c_) { -char buf[10]; +char buf[20]; int c = (unsigned char)c_; - if( (c>=0 && c<=31) || c>=127 || c==39 || c==92 ) + if( (c>=0 && c<=31) || c>=127 || c=='\'' || c=='\\' ) { sprintf(buf, "\\\\%03o", c); buffer += buf; @@ -391,6 +401,16 @@ DbTextStream & DbTextStream::operator<<(const std::wstring & str) +DbTextStream & DbTextStream::operator<<(bool v) +{ + if( v ) + EPutText("true"); + else + EPutText("false"); + +return *this; +} + DbTextStream & DbTextStream::operator<<(char v) { diff --git a/db/dbtextstream.h b/db/dbtextstream.h index a925184..006a9ef 100755 --- a/db/dbtextstream.h +++ b/db/dbtextstream.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -104,6 +104,7 @@ public: DbTextStream & operator<<(RawText raw); DbTextStream & operator<<(RawText raw); DbTextStream & operator<<(RawText raw); + DbTextStream & operator<<(RawText raw); DbTextStream & operator<<(RawText raw); DbTextStream & operator<<(RawText raw); DbTextStream & operator<<(RawText raw); @@ -140,6 +141,7 @@ public: DbTextStream & operator<<(const wchar_t * str); DbTextStream & operator<<(const std::wstring * str); DbTextStream & operator<<(const std::wstring & str); + DbTextStream & operator<<(bool); DbTextStream & operator<<(char); DbTextStream & operator<<(wchar_t); DbTextStream & operator<<(int); diff --git a/functions/Makefile.dep b/functions/Makefile.dep index ed31da2..56548a3 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -24,9 +24,9 @@ adduser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h adduser.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h -adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -adduser.o: ../core/basethread.h ../core/synchro.h +adduser.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +adduser.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h cat.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -50,8 +50,8 @@ cat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h cat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h cat.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -cat.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -cat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +cat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +cat.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h cat.o: ../core/synchro.h chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -77,8 +77,9 @@ chmod.o: ../templates/htmltextstream.h ../notify/notifythread.h chmod.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h chmod.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h chmod.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -chmod.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -chmod.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +chmod.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +chmod.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +chmod.o: ../core/synchro.h chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chown.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -103,8 +104,9 @@ chown.o: ../templates/htmltextstream.h ../notify/notifythread.h chown.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h chown.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h chown.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -chown.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -chown.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +chown.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +chown.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +chown.o: ../core/synchro.h ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -130,9 +132,10 @@ ckeditor.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ckeditor.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h ckeditor.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h ckeditor.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -ckeditor.o: ../core/mount.h ../core/mountparser.h ../core/users.h -ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h -ckeditor.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +ckeditor.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +ckeditor.o: ../core/users.h ../core/groups.h ../core/group.h +ckeditor.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ckeditor.o: ../core/synchro.h cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h cp.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h @@ -156,8 +159,8 @@ cp.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h cp.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h cp.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h cp.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -cp.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +cp.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +cp.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h cp.o: ../core/synchro.h ../core/misc.h default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -183,9 +186,9 @@ default.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h default.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h default.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h default.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -default.o: ../core/mount.h ../core/mountparser.h ../core/users.h -default.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -default.o: ../core/basethread.h ../core/synchro.h +default.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +default.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +default.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h download.o: download.h functionbase.h ../core/item.h ../db/db.h download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h download.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -211,9 +214,10 @@ download.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h download.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h download.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h download.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -download.o: ../core/mount.h ../core/mountparser.h ../core/users.h -download.o: ../core/groups.h ../core/group.h ../core/loadavg.h -download.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +download.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +download.o: ../core/users.h ../core/groups.h ../core/group.h +download.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +download.o: ../core/synchro.h emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h emacs.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -238,11 +242,12 @@ emacs.o: ../templates/htmltextstream.h ../notify/notifythread.h emacs.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h emacs.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h emacs.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -emacs.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -emacs.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -emacs.o: ../templates/templates.h ../templates/patterncacher.h -emacs.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -emacs.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +emacs.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +emacs.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +emacs.o: ../core/synchro.h ../templates/templates.h +emacs.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +emacs.o: ../core/httpsimpleparser.h ../core/log.h +emacs.o: ../templates/indexpatterns.h ../core/sessionmanager.h emacs.o: ../core/sessioncontainer.h ../core/system.h functionbase.o: functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -272,9 +277,9 @@ functionbase.o: ../core/basethread.h ../core/synchro.h functionbase.o: ../notify/templatesnotify.h ../core/users.h functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h functionbase.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -functionbase.o: ../core/users.h ../core/groups.h ../core/group.h -functionbase.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -functionbase.o: ../core/synchro.h +functionbase.o: ../core/crypt.h ../core/users.h ../core/groups.h +functionbase.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +functionbase.o: ../core/basethread.h ../core/synchro.h functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h functionparser.o: ../core/item.h ../core/error.h ../core/log.h @@ -304,9 +309,9 @@ functionparser.o: ../core/basethread.h ../core/synchro.h functionparser.o: ../notify/templatesnotify.h ../core/users.h functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h functionparser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -functionparser.o: ../core/users.h ../core/groups.h ../core/group.h -functionparser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -functionparser.o: ../core/log.h +functionparser.o: ../core/crypt.h ../core/users.h ../core/groups.h +functionparser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +functionparser.o: ../core/basethread.h ../core/log.h functions.o: functions.h functionbase.h ../core/item.h ../db/db.h functions.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h functions.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -327,21 +332,22 @@ functions.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h functions.o: ../notify/templatesnotify.h ../core/users.h ../core/user.h functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h functions.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -functions.o: ../core/users.h ../core/groups.h ../core/group.h ../core/rebus.h -functions.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -functions.o: ../core/synchro.h functionparser.h ../core/cur.h -functions.o: ../core/session.h ../core/plugindata.h adduser.h cat.h chmod.h -functions.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -functions.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h -functions.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -functions.o: ../core/htmlfilter.h ../core/log.h ../core/misc.h -functions.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h -functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h -functions.o: ../functions/functions.h ../templates/templates.h -functions.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -functions.o: ../core/httpsimpleparser.h ../core/log.h -functions.o: ../templates/indexpatterns.h ../core/sessionmanager.h +functions.o: ../core/crypt.h run.h ../core/users.h ../core/groups.h +functions.o: ../core/group.h ../core/rebus.h ../core/loadavg.h +functions.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +functions.o: functionparser.h ../core/cur.h ../core/session.h +functions.o: ../core/plugindata.h adduser.h cat.h chmod.h privchanger.h +functions.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h +functions.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +functions.o: rm.h specialdefault.h stat.h subject.h template.h tinymce.h +functions.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +functions.o: ../core/log.h ../core/misc.h ../core/plugin.h +functions.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h +functions.o: ../core/sessioncontainer.h ../functions/functions.h +functions.o: ../templates/templates.h ../templates/patterncacher.h +functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +functions.o: ../core/log.h ../templates/indexpatterns.h +functions.o: ../core/sessionmanager.h last.o: last.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h last.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -366,8 +372,9 @@ last.o: ../templates/htmltextstream.h ../notify/notifythread.h last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h last.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -last.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +last.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +last.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +last.o: ../core/synchro.h ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ln.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h @@ -391,8 +398,8 @@ ln.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ln.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h ln.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h ln.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -ln.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ln.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +ln.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h ln.o: ../core/synchro.h ../core/misc.h ../functions/functions.h login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -418,8 +425,9 @@ login.o: ../templates/htmltextstream.h ../notify/notifythread.h login.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h login.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -login.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -login.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +login.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +login.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +login.o: ../core/synchro.h logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h logout.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -444,9 +452,9 @@ logout.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h logout.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h logout.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h logout.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -logout.o: ../core/mount.h ../core/mountparser.h ../core/users.h -logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -logout.o: ../core/basethread.h ../core/synchro.h +logout.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +logout.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +logout.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ls.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h @@ -470,8 +478,8 @@ ls.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h ls.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -ls.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ls.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +ls.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h ls.o: ../core/synchro.h mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -497,8 +505,9 @@ mkdir.o: ../templates/htmltextstream.h ../notify/notifythread.h mkdir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h mkdir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h mkdir.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -mkdir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -mkdir.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +mkdir.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +mkdir.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mkdir.o: ../core/synchro.h mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h mv.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h @@ -522,8 +531,8 @@ mv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h mv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h mv.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -mv.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mv.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +mv.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h mv.o: ../core/synchro.h node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -549,8 +558,9 @@ node.o: ../templates/htmltextstream.h ../notify/notifythread.h node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h node.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -node.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -node.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +node.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +node.o: ../core/synchro.h priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h priv.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -575,8 +585,9 @@ priv.o: ../templates/htmltextstream.h ../notify/notifythread.h priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h priv.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -priv.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +priv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +priv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +priv.o: ../core/synchro.h privchanger.o: privchanger.h ../core/request.h ../core/requesttypes.h privchanger.o: ../core/item.h ../core/error.h ../core/config.h privchanger.o: ../core/confparser.h ../core/htmlfilter.h ../core/textstream.h @@ -605,8 +616,9 @@ privchanger.o: ../core/basethread.h ../core/synchro.h privchanger.o: ../notify/templatesnotify.h ../core/users.h privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h privchanger.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -privchanger.o: ../core/users.h ../core/groups.h ../core/group.h -privchanger.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +privchanger.o: ../core/crypt.h ../core/users.h ../core/groups.h +privchanger.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +privchanger.o: ../core/basethread.h reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h reload.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -631,12 +643,12 @@ reload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h reload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h reload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h reload.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -reload.o: ../core/mount.h ../core/mountparser.h ../core/users.h -reload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -reload.o: ../core/basethread.h ../core/synchro.h ../templates/templates.h -reload.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -reload.o: ../core/httpsimpleparser.h ../core/log.h -reload.o: ../templates/indexpatterns.h ../core/sessionmanager.h +reload.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +reload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +reload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +reload.o: ../templates/templates.h ../templates/patterncacher.h +reload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h reload.o: ../core/sessioncontainer.h ../core/system.h rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h @@ -661,8 +673,8 @@ rm.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h rm.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h rm.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h rm.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -rm.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -rm.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +rm.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +rm.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h rm.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h ../core/system.h rm.o: ../core/sessionmanager.h ../core/sessioncontainer.h rm.o: ../functions/functions.h ../templates/templates.h @@ -692,8 +704,8 @@ run.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h run.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h run.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -run.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -run.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +run.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +run.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h run.o: ../core/synchro.h specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h @@ -724,9 +736,9 @@ specialdefault.o: ../core/basethread.h ../core/synchro.h specialdefault.o: ../notify/templatesnotify.h ../core/users.h specialdefault.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h specialdefault.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -specialdefault.o: ../core/users.h ../core/groups.h ../core/group.h -specialdefault.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -specialdefault.o: ../core/synchro.h +specialdefault.o: ../core/crypt.h ../core/users.h ../core/groups.h +specialdefault.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +specialdefault.o: ../core/basethread.h ../core/synchro.h stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h stat.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -751,8 +763,9 @@ stat.o: ../templates/htmltextstream.h ../notify/notifythread.h stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h stat.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -stat.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +stat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +stat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +stat.o: ../core/synchro.h subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h subject.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -777,9 +790,9 @@ subject.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h subject.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h subject.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h subject.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -subject.o: ../core/mount.h ../core/mountparser.h ../core/users.h -subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -subject.o: ../core/basethread.h ../core/synchro.h +subject.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +subject.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +subject.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h template.o: template.h functionbase.h ../core/item.h ../db/db.h template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -806,10 +819,10 @@ template.o: ../templates/htmltextstream.h ../notify/notifythread.h template.o: ../core/basethread.h ../core/synchro.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h template.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -template.o: ../core/mount.h ../core/mountparser.h ../core/users.h -template.o: ../core/groups.h ../core/group.h ../core/loadavg.h -template.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -template.o: ../core/misc.h +template.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +template.o: ../core/users.h ../core/groups.h ../core/group.h +template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +template.o: ../core/synchro.h ../core/misc.h tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h tinymce.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -834,9 +847,9 @@ tinymce.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h tinymce.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h tinymce.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h tinymce.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -tinymce.o: ../core/mount.h ../core/mountparser.h ../core/users.h -tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -tinymce.o: ../core/basethread.h ../core/synchro.h +tinymce.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +tinymce.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +tinymce.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uname.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -861,8 +874,9 @@ uname.o: ../templates/htmltextstream.h ../notify/notifythread.h uname.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h uname.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -uname.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -uname.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +uname.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +uname.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +uname.o: ../core/synchro.h upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h upload.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -887,10 +901,10 @@ upload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h upload.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -upload.o: ../core/mount.h ../core/mountparser.h ../core/users.h -upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -upload.o: ../core/basethread.h ../core/synchro.h ../core/misc.h -upload.o: ../functions/functions.h +upload.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +upload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +upload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +upload.o: ../core/misc.h ../functions/functions.h uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uptime.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -915,9 +929,9 @@ uptime.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h uptime.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -uptime.o: ../core/mount.h ../core/mountparser.h ../core/users.h -uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -uptime.o: ../core/basethread.h ../core/synchro.h +uptime.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +uptime.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +uptime.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h vim.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -941,8 +955,8 @@ vim.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h vim.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h vim.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -vim.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -vim.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +vim.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +vim.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h vim.o: ../core/synchro.h who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -967,6 +981,6 @@ who.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h who.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h -who.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h -who.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +who.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h +who.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h who.o: ../core/synchro.h diff --git a/functions/adduser.cpp b/functions/adduser.cpp index 042dadd..57e0343 100755 --- a/functions/adduser.cpp +++ b/functions/adduser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -35,7 +35,7 @@ bool AddUser::CheckAddUserVars(const std::wstring & login, const std::wstring & return false; } - if( pass.size() < config->password_min_size ) + if( pass.size() < config->pass_min_size ) { cur->request->status = WINIX_ERR_PASSWORD_TOO_SHORT; return false; @@ -61,7 +61,7 @@ User user; const std::wstring & login = cur->request->PostVar(L"login"); const std::wstring & pass = cur->request->PostVar(L"password"); - const std::wstring & conf_pass = cur->request->PostVar(L"confirmpassword"); + const std::wstring & conf_pass = cur->request->PostVar(L"passwordconfirm"); if( !CheckAddUserVars(login, pass, conf_pass) ) return; @@ -69,7 +69,10 @@ User user; user.name = login; user.email = cur->request->PostVar(L"email"); - cur->request->status = db->AddUser(user, pass); + up.pass = pass; + system->crypt.PassHashCrypt(up); + + cur->request->status = db->AddUser(user, up.pass, up.pass_encrypted, up.pass_type, up.pass_hash_salted); if( cur->request->status == WINIX_ERR_OK ) { @@ -91,6 +94,36 @@ User user; } +void AddUser::MakeGet() +{ + Run s; + std::string out; + + /* + s.Env("PATH=/home/tomek/mybin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin"); + s.Env("PWD=/home/tomek"); + s.Env("SHELL=/bin/tcsh"); + s.Env("USER=tomek"); + s.Env("GROUP=wheel"); + s.Env("HOME=/home/tomek"); + */ + + s.Par("dgst"); + s.Par("-sha512"); + s.Cmd("/usr/bin/openssl"); + + if( s.Go("swinka", out) == 0 ) + log << log1 << "odpowiedz: " << out << logend; + + if( s.Go("cosik", out) == 0 ) + log << log1 << "odpowiedz: " << out << logend; + + if( s.Go("ktosik", out) == 0 ) + log << log1 << "odpowiedz: " << out << logend; + + if( s.Go("", out) == 0 ) + log << log1 << "odpowiedz: " << out << logend; +} } // namespace diff --git a/functions/adduser.h b/functions/adduser.h index 9df9c0b..af7851a 100755 --- a/functions/adduser.h +++ b/functions/adduser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -11,7 +11,7 @@ #define headerfile_winix_functions_adduser #include "functionbase.h" - +#include "core/user.h" namespace Fun @@ -24,11 +24,12 @@ public: AddUser(); void MakePost(); + void MakeGet(); private: bool CheckAddUserVars(const std::wstring & login, const std::wstring & pass, const std::wstring & conf_pass); - + UserPass up; }; diff --git a/functions/login.cpp b/functions/login.cpp index 98a28da..bb1f8ff 100755 --- a/functions/login.cpp +++ b/functions/login.cpp @@ -2,12 +2,14 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ #include "login.h" +#include "utf8.h" + namespace Fun @@ -19,6 +21,79 @@ Login::Login() } +void Login::ClearTmpStruct() +{ + system->crypt.ClearString(pass_decrypted); + system->crypt.ClearString(pass_hashed); + system->crypt.ClearString(up.pass); + system->crypt.ClearString(up.pass_encrypted); + system->crypt.ClearString(up2.pass); + system->crypt.ClearString(up2.pass_encrypted); +} + + + +bool Login::CheckPasswords(const std::wstring & password) +{ + if( !up.pass_encrypted.empty() ) + { + if( system->crypt.RSA(false, config->pass_rsa_private_key, up.pass_encrypted, pass_decrypted) ) + { + Ezc::UTF8ToWide(pass_decrypted, up.pass); + } + else + { + log << log1 << "Login: I cannot decrypt a stored password, login failure" << logend; + return false; + } + } + + pass_hashed = password; + up2.pass_type = up.pass_type; + up2.pass = password; + + if( up.pass_hash_salted ) + salt = config->pass_hash_salt; + else + salt.clear(); + + if( !system->crypt.PassHash(salt, up2) ) + { + log << log1 << "Login: I cannot hash a password, login failure" << logend; + return false; + } + +return up.pass == up2.pass; +} + + + +/* + this method is checking whether there is a person with that login and password + in the database + + return true if it has found one and sets it user_id +*/ +bool Login::CheckUserPass(const std::wstring & login, const std::wstring & password, long & user_id) +{ +bool result; + + if( db->GetUserPass(login, user_id, up) ) + { + result = CheckPasswords(password); + } + else + { + log << log1 << "Login: there is no a user: " << login << " in the database (or an error)" << logend; + result = false; + } + + ClearTmpStruct(); + +return result; +} + + void Login::MakePost() { @@ -33,10 +108,14 @@ void Login::MakePost() const std::wstring & remem = cur->request->PostVar(L"rememberme"); long user_id; - if( db->CheckUser(login, pass, user_id) ) + if( CheckUserPass(login, pass, user_id) ) + { system->users.LoginUser(user_id, !remem.empty()); - - // !! moze zglosic komunikat o nie poprawnym logowaniu + } + else + { + // !! moze zglosic komunikat o nie poprawnym logowaniu + } system->RedirectToLastItem(); } diff --git a/functions/login.h b/functions/login.h index 11d9fc7..48885a5 100755 --- a/functions/login.h +++ b/functions/login.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,7 @@ #define headerfile_winix_functions_login #include "functionbase.h" +#include "core/user.h" @@ -24,10 +25,18 @@ public: Login(); void MakePost(); + bool CheckUserPass(const std::wstring & login, const std::wstring & password, long & user_id); private: + void LoginUser(long user_id, bool remember_me); + void ClearTmpStruct(); + bool CheckPasswords(const std::wstring & password); + UserPass up, up2; + std::string pass_decrypted; + std::wstring pass_hashed; + std::wstring salt; }; diff --git a/html/fun_adduser.html b/html/fun_adduser.html index 619d289..89c1a96 100755 --- a/html/fun_adduser.html +++ b/html/fun_adduser.html @@ -15,7 +15,7 @@

{adduser_confirm_password}:

- +

{adduser_email}:

diff --git a/main/Makefile.dep b/main/Makefile.dep index 0bf92a2..9a69e84 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -20,8 +20,9 @@ main.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h main.o: ../core/user.h ../core/ugcontainer.h ../core/lastcontainer.h main.o: ../core/cur.h ../core/session.h ../core/plugindata.h ../core/rebus.h main.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -main.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -main.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h +main.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +main.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +main.o: ../core/basethread.h ../core/sessionmanager.h main.o: ../core/sessioncontainer.h ../functions/functions.h main.o: ../functions/functionbase.h ../core/request.h ../core/system.h main.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h @@ -32,15 +33,14 @@ main.o: ../functions/download.h ../functions/emacs.h ../functions/last.h main.o: ../functions/login.h ../functions/logout.h ../functions/ln.h main.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h main.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -main.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h -main.o: ../functions/stat.h ../functions/subject.h ../functions/template.h -main.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h -main.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h -main.o: ../core/htmlfilter.h ../templates/templates.h -main.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -main.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -main.o: ../core/sessionmanager.h ../core/compress.h ../core/getparser.h -main.o: ../core/httpsimpleparser.h ../core/postparser.h -main.o: ../core/cookieparser.h ../core/postmultiparser.h +main.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h +main.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h +main.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +main.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h +main.o: ../templates/templates.h ../templates/patterncacher.h +main.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +main.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +main.o: ../core/compress.h ../core/getparser.h ../core/httpsimpleparser.h +main.o: ../core/postparser.h ../core/cookieparser.h ../core/postmultiparser.h main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h main.o: ../core/plugin.h ../core/pluginmsg.h diff --git a/main/main.cpp b/main/main.cpp index 110d14e..814165f 100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "core/log.h" #include "core/app.h" @@ -39,6 +40,37 @@ void print_syntax() +void CreateNewDescriptor(int des_dst, int flags) +{ +int descriptor; + + descriptor = open("/dev/null", flags | O_NOCTTY); + + if( descriptor != -1 ) + { + dup2(descriptor, des_dst); + + if( descriptor != des_dst ) + close(descriptor); + } +} + + + +void CloseDescriptors() +{ + close(0); + close(1); + close(2); + app.stdout_is_closed = true; + + CreateNewDescriptor(0, O_RDONLY); + CreateNewDescriptor(1, O_WRONLY); + CreateNewDescriptor(2, O_WRONLY); +} + + + int main(int argv, char ** argc) { @@ -59,16 +91,8 @@ int main(int argv, char ** argc) if( app.stdout_is_closed || app.config.demonize ) app.config.log_stdout = false; - // closing descriptors only at the beginning - // !! temporary we do not close standard output for errors - // client postgresql uses it for reporting warnings (I don't know why) - //close(2); - if( !app.config.log_stdout ) - { - close(1); - app.stdout_is_closed = true; - } + CloseDescriptors(); log.Init(app.config.log_level, app.config.log_save_each_line, app.config.log_file, app.config.log_stdout, app.config.log_request); diff --git a/notify/Makefile.dep b/notify/Makefile.dep index 1fdf31f..ada9126 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -23,8 +23,8 @@ notify.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h notify.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h notify.o: ../notify/notify.h ../core/mounts.h ../core/mount.h -notify.o: ../core/mountparser.h ../core/users.h ../core/groups.h -notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +notify.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h notify.o: ../core/basethread.h ../core/sessionmanager.h notify.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h notify.o: ../core/request.h ../core/dirs.h ../core/synchro.h ../core/plugin.h @@ -37,7 +37,7 @@ notify.o: ../functions/default.h ../functions/download.h ../functions/emacs.h notify.o: ../functions/last.h ../functions/login.h ../functions/logout.h notify.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h notify.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -notify.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +notify.o: ../functions/reload.h ../functions/rm.h notify.o: ../functions/specialdefault.h ../functions/stat.h notify.o: ../functions/subject.h ../functions/template.h notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h @@ -82,7 +82,8 @@ templatesnotify.o: ../core/dircontainer.h ../core/ugcontainer.h templatesnotify.o: ../core/request.h ../core/config.h ../core/confparser.h templatesnotify.o: ../core/htmlfilter.h ../core/system.h ../core/dirs.h templatesnotify.o: ../core/dircontainer.h ../notify/notify.h ../core/mounts.h -templatesnotify.o: ../core/mount.h ../core/mountparser.h ../core/users.h +templatesnotify.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +templatesnotify.o: ../core/run.h ../core/user.h ../core/users.h templatesnotify.o: ../core/groups.h ../core/group.h ../core/ugcontainer.h templatesnotify.o: ../core/rebus.h ../core/loadavg.h ../core/thumb.h templatesnotify.o: ../core/basethread.h ../core/synchro.h @@ -96,17 +97,17 @@ templatesnotify.o: ../functions/last.h ../functions/login.h templatesnotify.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h templatesnotify.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h templatesnotify.o: ../functions/priv.h ../functions/reload.h -templatesnotify.o: ../functions/rm.h ../functions/run.h -templatesnotify.o: ../functions/specialdefault.h ../functions/stat.h -templatesnotify.o: ../functions/subject.h ../functions/template.h -templatesnotify.o: ../functions/tinymce.h ../functions/uname.h -templatesnotify.o: ../functions/upload.h ../functions/uptime.h -templatesnotify.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h +templatesnotify.o: ../functions/rm.h ../functions/specialdefault.h +templatesnotify.o: ../functions/stat.h ../functions/subject.h +templatesnotify.o: ../functions/template.h ../functions/tinymce.h +templatesnotify.o: ../functions/uname.h ../functions/upload.h +templatesnotify.o: ../functions/uptime.h ../functions/who.h +templatesnotify.o: ../functions/vim.h ../core/htmlfilter.h templatesnotify.o: ../templates/templates.h ../templates/patterncacher.h templatesnotify.o: ../templates/ckeditorgetparser.h templatesnotify.o: ../core/httpsimpleparser.h ../core/log.h templatesnotify.o: ../templates/indexpatterns.h ../templates/localefilter.h templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h templatesnotify.o: ../core/sessionmanager.h ../core/sessioncontainer.h -templatesnotify.o: ../core/session.h ../core/user.h ../core/cur.h -templatesnotify.o: ../core/lastcontainer.h ../core/misc.h +templatesnotify.o: ../core/session.h ../core/cur.h ../core/lastcontainer.h +templatesnotify.o: ../core/misc.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index aaa4b5a..8696e3d 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -25,10 +25,10 @@ gallery.o: ../../notify/templatesnotify.h ../../core/users.h gallery.o: ../../core/user.h ../../core/ugcontainer.h gallery.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h gallery.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h -gallery.o: ../../core/mount.h ../../core/mountparser.h ../../core/users.h -gallery.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -gallery.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h -gallery.o: galleryinfo.h +gallery.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h +gallery.o: ../../core/run.h ../../core/users.h ../../core/groups.h +gallery.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +gallery.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h galleryinfo.o: galleryinfo.h ../../core/item.h init.o: gallery.h ../../functions/functionbase.h ../../core/item.h init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h @@ -54,10 +54,11 @@ init.o: ../../notify/templatesnotify.h ../../core/users.h ../../core/user.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h ../../core/cur.h init.o: ../../core/session.h ../../core/plugindata.h ../../core/rebus.h init.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -init.o: ../../core/users.h ../../core/groups.h ../../core/group.h -init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/synchro.h galleryinfo.h ../../core/log.h -init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h +init.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +init.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +init.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h +init.o: galleryinfo.h ../../core/log.h ../../core/plugin.h +init.o: ../../core/pluginmsg.h ../../core/system.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h init.o: ../../functions/functions.h ../../functions/functionbase.h init.o: ../../functions/functionparser.h ../../core/cur.h @@ -70,15 +71,15 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -init.o: ../../functions/run.h ../../functions/specialdefault.h -init.o: ../../functions/stat.h ../../functions/subject.h -init.o: ../../functions/template.h ../../functions/tinymce.h -init.o: ../../functions/uname.h ../../functions/upload.h -init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -init.o: ../../core/htmlfilter.h ../../templates/templates.h -init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -init.o: ../../core/httpsimpleparser.h ../../core/log.h -init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h +init.o: ../../functions/specialdefault.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/template.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h +init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +init.o: ../../templates/templates.h ../../templates/patterncacher.h +init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h +init.o: ../../core/log.h ../../templates/indexpatterns.h +init.o: ../../core/sessionmanager.h templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h @@ -104,15 +105,15 @@ templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h -templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/users.h -templates.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -templates.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h -templates.o: galleryinfo.h ../../core/misc.h ../../core/plugin.h -templates.o: ../../core/pluginmsg.h ../../core/system.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../functions/functionparser.h ../../core/cur.h -templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h +templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h +templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +templates.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h +templates.o: ../../core/misc.h ../../core/plugin.h ../../core/pluginmsg.h +templates.o: ../../core/system.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../functions/functionparser.h +templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/cp.h ../../functions/default.h @@ -122,14 +123,13 @@ templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/node.h templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/run.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h -templates.o: ../../core/htmlfilter.h ../../templates/templates.h -templates.o: ../../templates/patterncacher.h +templates.o: ../../functions/rm.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h ../../core/htmlfilter.h +templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/groupitem/Makefile.dep b/plugins/groupitem/Makefile.dep index 31e3efe..88ad67f 100755 --- a/plugins/groupitem/Makefile.dep +++ b/plugins/groupitem/Makefile.dep @@ -24,8 +24,9 @@ init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h init.o: ../../core/user.h ../../core/ugcontainer.h ../../core/lastcontainer.h init.o: ../../core/cur.h ../../core/session.h ../../core/rebus.h init.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -init.o: ../../core/users.h ../../core/groups.h ../../core/group.h -init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +init.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +init.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +init.o: ../../core/thumb.h ../../core/basethread.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h init.o: ../../functions/functions.h ../../functions/functionbase.h init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h @@ -39,15 +40,15 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -init.o: ../../functions/run.h ../../functions/specialdefault.h -init.o: ../../functions/stat.h ../../functions/subject.h -init.o: ../../functions/template.h ../../functions/tinymce.h -init.o: ../../functions/uname.h ../../functions/upload.h -init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -init.o: ../../core/htmlfilter.h ../../templates/templates.h -init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -init.o: ../../core/httpsimpleparser.h ../../core/log.h -init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h +init.o: ../../functions/specialdefault.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/template.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h +init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +init.o: ../../templates/templates.h ../../templates/patterncacher.h +init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h +init.o: ../../core/log.h ../../templates/indexpatterns.h +init.o: ../../core/sessionmanager.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/pattern.h ../../core/item.h @@ -80,23 +81,23 @@ templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h -templates.o: ../../core/mountparser.h ../../core/users.h ../../core/groups.h -templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../core/request.h -templates.o: ../../core/synchro.h ../../functions/functionparser.h -templates.o: ../../functions/adduser.h ../../functions/cat.h -templates.o: ../../functions/chmod.h ../../functions/privchanger.h -templates.o: ../../functions/chown.h ../../functions/ckeditor.h -templates.o: ../../functions/cp.h ../../functions/default.h -templates.o: ../../functions/download.h ../../functions/emacs.h -templates.o: ../../functions/last.h ../../functions/login.h -templates.o: ../../functions/logout.h ../../functions/ln.h -templates.o: ../../functions/ls.h ../../functions/mkdir.h -templates.o: ../../functions/mv.h ../../functions/node.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/run.h +templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h +templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../core/request.h ../../core/synchro.h +templates.o: ../../functions/functionparser.h ../../functions/adduser.h +templates.o: ../../functions/cat.h ../../functions/chmod.h +templates.o: ../../functions/privchanger.h ../../functions/chown.h +templates.o: ../../functions/ckeditor.h ../../functions/cp.h +templates.o: ../../functions/default.h ../../functions/download.h +templates.o: ../../functions/emacs.h ../../functions/last.h +templates.o: ../../functions/login.h ../../functions/logout.h +templates.o: ../../functions/ln.h ../../functions/ls.h +templates.o: ../../functions/mkdir.h ../../functions/mv.h +templates.o: ../../functions/node.h ../../functions/priv.h +templates.o: ../../functions/reload.h ../../functions/rm.h templates.o: ../../functions/specialdefault.h ../../functions/stat.h templates.o: ../../functions/subject.h ../../functions/template.h templates.o: ../../functions/tinymce.h ../../functions/uname.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index f50dc93..b59c3d7 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -25,13 +25,14 @@ init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h init.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h init.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h -init.o: ../../core/mountparser.h ../../core/users.h ../../core/groups.h -init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -init.o: ../../core/basethread.h ../../core/sessionmanager.h -init.o: ../../core/sessioncontainer.h ../../functions/functions.h -init.o: ../../functions/functionbase.h ../../core/system.h -init.o: ../../core/synchro.h ../../functions/functionparser.h -init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +init.o: ../../core/users.h ../../core/groups.h ../../core/group.h +init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +init.o: ../../functions/functions.h ../../functions/functionbase.h +init.o: ../../core/system.h ../../core/synchro.h +init.o: ../../functions/functionparser.h ../../core/cur.h +init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -40,16 +41,15 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -init.o: ../../functions/run.h ../../functions/specialdefault.h -init.o: ../../functions/stat.h ../../functions/subject.h -init.o: ../../functions/template.h ../../functions/tinymce.h -init.o: ../../functions/uname.h ../../functions/upload.h -init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -init.o: ../../core/htmlfilter.h ../../templates/templates.h -init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -init.o: ../../core/httpsimpleparser.h ../../core/log.h -init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h -init.o: statssession.h ../../core/plugindata.h +init.o: ../../functions/specialdefault.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/template.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h +init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +init.o: ../../templates/templates.h ../../templates/patterncacher.h +init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h +init.o: ../../core/log.h ../../templates/indexpatterns.h +init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h stats.o: ../../core/misc.h ../../core/item.h ../../../ezc/src/utf8.h templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h @@ -75,16 +75,17 @@ templates.o: ../../notify/templatesnotify.h ../../core/config.h templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/error.h ../../core/rebus.h ../../core/mounts.h -templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/users.h -templates.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -templates.o: ../../core/thumb.h ../../core/basethread.h -templates.o: ../../core/textstream.h ../../core/misc.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../core/request.h ../../core/requesttypes.h -templates.o: ../../templates/htmltextstream.h ../../core/system.h -templates.o: ../../core/synchro.h ../../functions/functionparser.h -templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h +templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h +templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +templates.o: ../../core/basethread.h ../../core/textstream.h +templates.o: ../../core/misc.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../core/request.h +templates.o: ../../core/requesttypes.h ../../templates/htmltextstream.h +templates.o: ../../core/system.h ../../core/synchro.h +templates.o: ../../functions/functionparser.h ../../core/cur.h +templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/cp.h ../../functions/default.h @@ -94,14 +95,13 @@ templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/node.h templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/run.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h -templates.o: ../../core/htmlfilter.h ../../templates/templates.h -templates.o: ../../templates/patterncacher.h +templates.o: ../../functions/rm.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h ../../core/htmlfilter.h +templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index 7742132..fae914a 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -28,11 +28,11 @@ createthread.o: ../../core/user.h ../../core/ugcontainer.h createthread.o: ../../core/lastcontainer.h ../../core/cur.h createthread.o: ../../core/session.h ../../core/plugindata.h createthread.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h -createthread.o: ../../core/mountparser.h ../../core/users.h -createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -createthread.o: ../../core/thumb.h ../../core/basethread.h -createthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h -createthread.o: threadinfo.h ../../functions/functions.h +createthread.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +createthread.o: ../../core/users.h ../../core/groups.h ../../core/group.h +createthread.o: ../../core/loadavg.h ../../core/thumb.h +createthread.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h +createthread.o: ../../db/dbbase.h threadinfo.h ../../functions/functions.h createthread.o: ../../functions/functionbase.h createthread.o: ../../functions/functionparser.h ../../core/cur.h createthread.o: ../../functions/adduser.h ../../functions/cat.h @@ -45,13 +45,12 @@ createthread.o: ../../functions/logout.h ../../functions/ln.h createthread.o: ../../functions/ls.h ../../functions/mkdir.h createthread.o: ../../functions/mv.h ../../functions/node.h createthread.o: ../../functions/priv.h ../../functions/reload.h -createthread.o: ../../functions/rm.h ../../functions/run.h -createthread.o: ../../functions/specialdefault.h ../../functions/stat.h -createthread.o: ../../functions/subject.h ../../functions/template.h -createthread.o: ../../functions/tinymce.h ../../functions/uname.h -createthread.o: ../../functions/upload.h ../../functions/uptime.h -createthread.o: ../../functions/who.h ../../functions/vim.h -createthread.o: ../../core/htmlfilter.h +createthread.o: ../../functions/rm.h ../../functions/specialdefault.h +createthread.o: ../../functions/stat.h ../../functions/subject.h +createthread.o: ../../functions/template.h ../../functions/tinymce.h +createthread.o: ../../functions/uname.h ../../functions/upload.h +createthread.o: ../../functions/uptime.h ../../functions/who.h +createthread.o: ../../functions/vim.h ../../core/htmlfilter.h funthread.o: ../../core/misc.h ../../core/item.h funthread.h funthread.o: ../../functions/functionbase.h ../../core/item.h ../../db/db.h funthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h @@ -77,10 +76,11 @@ funthread.o: ../../notify/templatesnotify.h ../../core/users.h funthread.o: ../../core/user.h ../../core/ugcontainer.h funthread.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h funthread.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h -funthread.o: ../../core/mount.h ../../core/mountparser.h ../../core/users.h -funthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -funthread.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h -funthread.o: tdb.h thread.h ../../db/dbbase.h threadinfo.h +funthread.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h +funthread.o: ../../core/run.h ../../core/users.h ../../core/groups.h +funthread.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +funthread.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h +funthread.o: ../../db/dbbase.h threadinfo.h init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h init.o: ../../core/textstream.h reply.h ../../functions/functionbase.h init.o: ../../core/item.h ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h @@ -105,14 +105,15 @@ init.o: ../../notify/templatesnotify.h ../../core/users.h ../../core/user.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h ../../core/cur.h init.o: ../../core/session.h ../../core/plugindata.h ../../core/rebus.h init.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -init.o: ../../core/users.h ../../core/groups.h ../../core/group.h -init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/synchro.h threadinfo.h funthread.h createthread.h -init.o: showthreads.h ../../core/log.h ../../core/plugin.h pluginmsg.h -init.o: ../../core/system.h ../../core/sessionmanager.h -init.o: ../../core/sessioncontainer.h ../../functions/functions.h -init.o: ../../functions/functionbase.h ../../functions/functionparser.h -init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +init.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +init.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h +init.o: threadinfo.h funthread.h createthread.h showthreads.h +init.o: ../../core/log.h ../../core/plugin.h pluginmsg.h ../../core/system.h +init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +init.o: ../../functions/functions.h ../../functions/functionbase.h +init.o: ../../functions/functionparser.h ../../core/cur.h +init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -121,16 +122,15 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -init.o: ../../functions/run.h ../../functions/specialdefault.h -init.o: ../../functions/stat.h ../../functions/subject.h -init.o: ../../functions/template.h ../../functions/tinymce.h -init.o: ../../functions/uname.h ../../functions/upload.h -init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -init.o: ../../core/htmlfilter.h ../../templates/templates.h -init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -init.o: ../../core/httpsimpleparser.h ../../core/log.h -init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h -init.o: templates.h +init.o: ../../functions/specialdefault.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/template.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h +init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +init.o: ../../templates/templates.h ../../templates/patterncacher.h +init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h +init.o: ../../core/log.h ../../templates/indexpatterns.h +init.o: ../../core/sessionmanager.h templates.h reply.o: reply.h ../../functions/functionbase.h ../../core/item.h reply.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h reply.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h @@ -155,9 +155,10 @@ reply.o: ../../notify/templatesnotify.h ../../core/users.h ../../core/user.h reply.o: ../../core/ugcontainer.h ../../core/lastcontainer.h ../../core/cur.h reply.o: ../../core/session.h ../../core/plugindata.h ../../core/rebus.h reply.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h -reply.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -reply.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h threadinfo.h +reply.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +reply.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +reply.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h +reply.o: tdb.h thread.h ../../db/dbbase.h threadinfo.h reply.o: ../../functions/functions.h ../../functions/functionbase.h reply.o: ../../functions/functionparser.h ../../core/cur.h reply.o: ../../functions/adduser.h ../../functions/cat.h @@ -169,13 +170,13 @@ reply.o: ../../functions/last.h ../../functions/login.h reply.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h reply.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h reply.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -reply.o: ../../functions/run.h ../../functions/specialdefault.h -reply.o: ../../functions/stat.h ../../functions/subject.h -reply.o: ../../functions/template.h ../../functions/tinymce.h -reply.o: ../../functions/uname.h ../../functions/upload.h -reply.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -reply.o: ../../core/htmlfilter.h ../../core/misc.h ../../core/plugin.h -reply.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h +reply.o: ../../functions/specialdefault.h ../../functions/stat.h +reply.o: ../../functions/subject.h ../../functions/template.h +reply.o: ../../functions/tinymce.h ../../functions/uname.h +reply.o: ../../functions/upload.h ../../functions/uptime.h +reply.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +reply.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h +reply.o: ../../core/system.h ../../core/sessionmanager.h reply.o: ../../core/sessioncontainer.h ../../templates/templates.h reply.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h reply.o: ../../core/httpsimpleparser.h ../../core/log.h @@ -207,11 +208,11 @@ showthreads.o: ../../core/user.h ../../core/ugcontainer.h showthreads.o: ../../core/lastcontainer.h ../../core/cur.h showthreads.o: ../../core/session.h ../../core/plugindata.h showthreads.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h -showthreads.o: ../../core/mountparser.h ../../core/users.h -showthreads.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -showthreads.o: ../../core/thumb.h ../../core/basethread.h -showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h -showthreads.o: threadinfo.h +showthreads.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +showthreads.o: ../../core/users.h ../../core/groups.h ../../core/group.h +showthreads.o: ../../core/loadavg.h ../../core/thumb.h +showthreads.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h +showthreads.o: ../../db/dbbase.h threadinfo.h tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h tdb.o: ../../core/textstream.h ../../core/log.h templates.o: threadinfo.h ../../core/item.h ../../core/system.h @@ -238,17 +239,18 @@ templates.o: ../../core/cur.h ../../core/session.h ../../core/error.h templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h templates.o: ../../core/confparser.h ../../core/htmlfilter.h -templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h -templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -templates.o: thread.h tdb.h ../../db/dbbase.h reply.h -templates.o: ../../functions/functionbase.h ../../core/request.h -templates.o: ../../core/requesttypes.h ../../templates/htmltextstream.h -templates.o: ../../core/synchro.h funthread.h createthread.h showthreads.h -templates.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h -templates.o: ../../core/system.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../functions/functionparser.h -templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +templates.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +templates.o: ../../core/thumb.h ../../core/basethread.h thread.h tdb.h +templates.o: ../../db/dbbase.h reply.h ../../functions/functionbase.h +templates.o: ../../core/request.h ../../core/requesttypes.h +templates.o: ../../templates/htmltextstream.h ../../core/synchro.h +templates.o: funthread.h createthread.h showthreads.h ../../core/misc.h +templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../functions/functionparser.h ../../core/cur.h +templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/cp.h ../../functions/default.h @@ -258,14 +260,13 @@ templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/node.h templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/run.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h -templates.o: ../../core/htmlfilter.h ../../templates/templates.h -templates.o: ../../templates/patterncacher.h +templates.o: ../../functions/rm.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h ../../core/htmlfilter.h +templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -293,6 +294,7 @@ threadinfo.o: ../../core/cur.h ../../core/session.h ../../core/error.h threadinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h threadinfo.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h threadinfo.o: ../../core/confparser.h ../../core/htmlfilter.h -threadinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h -threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -threadinfo.o: thread.h tdb.h ../../db/dbbase.h +threadinfo.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +threadinfo.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +threadinfo.o: ../../core/thumb.h ../../core/basethread.h thread.h tdb.h +threadinfo.o: ../../db/dbbase.h diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index 5f3358c..038ef31 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -28,11 +28,12 @@ createticket.o: ../../core/user.h ../../core/ugcontainer.h createticket.o: ../../core/lastcontainer.h ../../core/cur.h createticket.o: ../../core/session.h ../../core/plugindata.h createticket.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h -createticket.o: ../../core/mountparser.h ../../core/users.h -createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -createticket.o: ../../core/thumb.h ../../core/basethread.h -createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h -createticket.o: ../../functions/functions.h ../../functions/functionbase.h +createticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +createticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h +createticket.o: ../../core/loadavg.h ../../core/thumb.h +createticket.o: ../../core/basethread.h ../../core/synchro.h ticketinfo.h +createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h +createticket.o: ../../functions/functionbase.h createticket.o: ../../functions/functionparser.h ../../core/cur.h createticket.o: ../../functions/adduser.h ../../functions/cat.h createticket.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -44,14 +45,13 @@ createticket.o: ../../functions/logout.h ../../functions/ln.h createticket.o: ../../functions/ls.h ../../functions/mkdir.h createticket.o: ../../functions/mv.h ../../functions/node.h createticket.o: ../../functions/priv.h ../../functions/reload.h -createticket.o: ../../functions/rm.h ../../functions/run.h -createticket.o: ../../functions/specialdefault.h ../../functions/stat.h -createticket.o: ../../functions/subject.h ../../functions/template.h -createticket.o: ../../functions/tinymce.h ../../functions/uname.h -createticket.o: ../../functions/upload.h ../../functions/uptime.h -createticket.o: ../../functions/who.h ../../functions/vim.h -createticket.o: ../../core/htmlfilter.h sessiondata.h ../../core/plugindata.h -createticket.o: ../../functions/rm.h +createticket.o: ../../functions/rm.h ../../functions/specialdefault.h +createticket.o: ../../functions/stat.h ../../functions/subject.h +createticket.o: ../../functions/template.h ../../functions/tinymce.h +createticket.o: ../../functions/uname.h ../../functions/upload.h +createticket.o: ../../functions/uptime.h ../../functions/who.h +createticket.o: ../../functions/vim.h ../../core/htmlfilter.h sessiondata.h +createticket.o: ../../core/plugindata.h ../../functions/rm.h editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h editticket.o: ../../db/dbtextstream.h ../../core/textstream.h editticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h @@ -77,8 +77,9 @@ editticket.o: ../../core/cur.h ../../core/session.h ../../core/error.h editticket.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h editticket.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h editticket.o: ../../core/confparser.h ../../core/htmlfilter.h -editticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h -editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +editticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +editticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +editticket.o: ../../core/thumb.h ../../core/basethread.h editticket.o: ../../functions/functions.h ../../functions/functionbase.h editticket.o: ../../functions/functionparser.h ../../core/cur.h editticket.o: ../../functions/adduser.h ../../functions/cat.h @@ -93,14 +94,14 @@ editticket.o: ../../functions/ln.h ../../functions/ls.h editticket.o: ../../functions/mkdir.h ../../functions/mv.h editticket.o: ../../functions/node.h ../../functions/priv.h editticket.o: ../../functions/reload.h ../../functions/rm.h -editticket.o: ../../functions/run.h ../../functions/specialdefault.h -editticket.o: ../../functions/stat.h ../../functions/subject.h -editticket.o: ../../functions/template.h ../../functions/tinymce.h -editticket.o: ../../functions/uname.h ../../functions/upload.h -editticket.o: ../../functions/uptime.h ../../functions/who.h -editticket.o: ../../functions/vim.h ../../core/htmlfilter.h -editticket.o: ../../functions/functionbase.h ../../core/synchro.h -editticket.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h +editticket.o: ../../functions/specialdefault.h ../../functions/stat.h +editticket.o: ../../functions/subject.h ../../functions/template.h +editticket.o: ../../functions/tinymce.h ../../functions/uname.h +editticket.o: ../../functions/upload.h ../../functions/uptime.h +editticket.o: ../../functions/who.h ../../functions/vim.h +editticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h +editticket.o: ../../core/synchro.h sessiondata.h ../../core/plugindata.h +editticket.o: ../../functions/rm.h funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h funticket.o: ../../db/dbtextstream.h ../../core/textstream.h funticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h @@ -126,8 +127,9 @@ funticket.o: ../../core/cur.h ../../core/session.h ../../core/error.h funticket.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h funticket.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h funticket.o: ../../core/confparser.h ../../core/htmlfilter.h -funticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h -funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +funticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +funticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +funticket.o: ../../core/thumb.h ../../core/basethread.h funticket.o: ../../functions/functions.h ../../functions/functionbase.h funticket.o: ../../functions/functionparser.h ../../core/cur.h funticket.o: ../../functions/adduser.h ../../functions/cat.h @@ -142,16 +144,16 @@ funticket.o: ../../functions/ln.h ../../functions/ls.h funticket.o: ../../functions/mkdir.h ../../functions/mv.h funticket.o: ../../functions/node.h ../../functions/priv.h funticket.o: ../../functions/reload.h ../../functions/rm.h -funticket.o: ../../functions/run.h ../../functions/specialdefault.h -funticket.o: ../../functions/stat.h ../../functions/subject.h -funticket.o: ../../functions/template.h ../../functions/tinymce.h -funticket.o: ../../functions/uname.h ../../functions/upload.h -funticket.o: ../../functions/uptime.h ../../functions/who.h -funticket.o: ../../functions/vim.h ../../core/htmlfilter.h -funticket.o: ../../functions/functionbase.h ../../core/synchro.h -funticket.o: ../../core/plugin.h pluginmsg.h ../../core/system.h -funticket.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -funticket.o: ../../templates/templates.h ../../templates/patterncacher.h +funticket.o: ../../functions/specialdefault.h ../../functions/stat.h +funticket.o: ../../functions/subject.h ../../functions/template.h +funticket.o: ../../functions/tinymce.h ../../functions/uname.h +funticket.o: ../../functions/upload.h ../../functions/uptime.h +funticket.o: ../../functions/who.h ../../functions/vim.h +funticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h +funticket.o: ../../core/synchro.h ../../core/plugin.h pluginmsg.h +funticket.o: ../../core/system.h ../../core/sessionmanager.h +funticket.o: ../../core/sessioncontainer.h ../../templates/templates.h +funticket.o: ../../templates/patterncacher.h funticket.o: ../../templates/ckeditorgetparser.h funticket.o: ../../core/httpsimpleparser.h ../../core/log.h funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -178,12 +180,12 @@ init.o: ../../core/user.h ../../core/ugcontainer.h ../../core/lastcontainer.h init.o: ../../core/cur.h ../../core/session.h ../../core/error.h init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h init.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h -init.o: ../../core/confparser.h ../../core/htmlfilter.h ../../core/users.h -init.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -init.o: ../../core/thumb.h ../../core/basethread.h -init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../functions/functionparser.h ../../core/cur.h -init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h ../../core/crypt.h +init.o: ../../core/run.h ../../core/users.h ../../core/groups.h +init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +init.o: ../../core/basethread.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../functions/functionparser.h +init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../core/request.h ../../core/requesttypes.h init.o: ../../templates/htmltextstream.h ../../functions/chown.h @@ -193,7 +195,7 @@ init.o: ../../functions/emacs.h ../../functions/last.h init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ln.h init.o: ../../functions/ls.h ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/node.h ../../functions/priv.h -init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/run.h +init.o: ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h init.o: ../../functions/tinymce.h ../../functions/uname.h @@ -237,8 +239,9 @@ showtickets.o: ../../core/session.h ../../core/error.h showtickets.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h showtickets.o: ../../core/mount.h ../../core/mountparser.h showtickets.o: ../../core/config.h ../../core/confparser.h -showtickets.o: ../../core/htmlfilter.h ../../core/users.h ../../core/groups.h -showtickets.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +showtickets.o: ../../core/htmlfilter.h ../../core/crypt.h ../../core/run.h +showtickets.o: ../../core/users.h ../../core/groups.h ../../core/group.h +showtickets.o: ../../core/loadavg.h ../../core/thumb.h showtickets.o: ../../core/basethread.h ../../functions/functions.h showtickets.o: ../../functions/functionbase.h showtickets.o: ../../functions/functionparser.h ../../core/cur.h @@ -254,17 +257,17 @@ showtickets.o: ../../functions/ln.h ../../functions/ls.h showtickets.o: ../../functions/mkdir.h ../../functions/mv.h showtickets.o: ../../functions/node.h ../../functions/priv.h showtickets.o: ../../functions/reload.h ../../functions/rm.h -showtickets.o: ../../functions/run.h ../../functions/specialdefault.h -showtickets.o: ../../functions/stat.h ../../functions/subject.h -showtickets.o: ../../functions/template.h ../../functions/tinymce.h -showtickets.o: ../../functions/uname.h ../../functions/upload.h -showtickets.o: ../../functions/uptime.h ../../functions/who.h -showtickets.o: ../../functions/vim.h ../../core/htmlfilter.h -showtickets.o: ../../functions/functionbase.h ../../core/synchro.h -showtickets.o: pluginmsg.h ../../plugins/thread/pluginmsg.h -showtickets.o: ../../core/plugin.h ../../core/system.h -showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h +showtickets.o: ../../functions/specialdefault.h ../../functions/stat.h +showtickets.o: ../../functions/subject.h ../../functions/template.h +showtickets.o: ../../functions/tinymce.h ../../functions/uname.h +showtickets.o: ../../functions/upload.h ../../functions/uptime.h +showtickets.o: ../../functions/who.h ../../functions/vim.h +showtickets.o: ../../core/htmlfilter.h ../../functions/functionbase.h +showtickets.o: ../../core/synchro.h pluginmsg.h +showtickets.o: ../../plugins/thread/pluginmsg.h ../../core/plugin.h +showtickets.o: ../../core/system.h ../../core/sessionmanager.h +showtickets.o: ../../core/sessioncontainer.h ../../templates/templates.h +showtickets.o: ../../templates/patterncacher.h showtickets.o: ../../templates/ckeditorgetparser.h showtickets.o: ../../core/httpsimpleparser.h ../../core/log.h showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -295,11 +298,12 @@ templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/error.h ../../core/plugindata.h ../../core/rebus.h templates.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h templates.o: ../../core/config.h ../../core/confparser.h -templates.o: ../../core/htmlfilter.h ../../core/users.h ../../core/groups.h -templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../functions/functionparser.h -templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/htmlfilter.h ../../core/crypt.h ../../core/run.h +templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h +templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../functions/functionparser.h ../../core/cur.h +templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../core/request.h ../../core/requesttypes.h templates.o: ../../templates/htmltextstream.h ../../functions/chown.h @@ -311,18 +315,18 @@ templates.o: ../../functions/ln.h ../../functions/ls.h templates.o: ../../functions/mkdir.h ../../functions/mv.h templates.o: ../../functions/node.h ../../functions/priv.h templates.o: ../../functions/reload.h ../../functions/rm.h -templates.o: ../../functions/run.h ../../functions/specialdefault.h -templates.o: ../../functions/stat.h ../../functions/subject.h -templates.o: ../../functions/template.h ../../functions/tinymce.h -templates.o: ../../functions/uname.h ../../functions/upload.h -templates.o: ../../functions/uptime.h ../../functions/who.h -templates.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h -templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h -templates.o: ../../core/error.h editticket.h ../../functions/functionbase.h -templates.o: ../../core/synchro.h createticket.h ../../core/misc.h -templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../templates/templates.h ../../templates/patterncacher.h +templates.o: ../../functions/specialdefault.h ../../functions/stat.h +templates.o: ../../functions/subject.h ../../functions/template.h +templates.o: ../../functions/tinymce.h ../../functions/uname.h +templates.o: ../../functions/upload.h ../../functions/uptime.h +templates.o: ../../functions/who.h ../../functions/vim.h +templates.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h +templates.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h +templates.o: editticket.h ../../functions/functionbase.h ../../core/synchro.h +templates.o: createticket.h ../../core/misc.h ../../core/plugin.h pluginmsg.h +templates.o: ../../core/system.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../templates/templates.h +templates.o: ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -353,8 +357,9 @@ ticketinfo.o: ../../core/session.h ../../core/error.h ../../core/plugindata.h ticketinfo.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h ticketinfo.o: ../../core/mountparser.h ../../core/config.h ticketinfo.o: ../../core/confparser.h ../../core/htmlfilter.h -ticketinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h -ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +ticketinfo.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +ticketinfo.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +ticketinfo.o: ../../core/thumb.h ../../core/basethread.h ticketinfo.o: ../../functions/functions.h ../../functions/functionbase.h ticketinfo.o: ../../functions/functionparser.h ../../core/cur.h ticketinfo.o: ../../functions/adduser.h ../../functions/cat.h @@ -369,14 +374,14 @@ ticketinfo.o: ../../functions/ln.h ../../functions/ls.h ticketinfo.o: ../../functions/mkdir.h ../../functions/mv.h ticketinfo.o: ../../functions/node.h ../../functions/priv.h ticketinfo.o: ../../functions/reload.h ../../functions/rm.h -ticketinfo.o: ../../functions/run.h ../../functions/specialdefault.h -ticketinfo.o: ../../functions/stat.h ../../functions/subject.h -ticketinfo.o: ../../functions/template.h ../../functions/tinymce.h -ticketinfo.o: ../../functions/uname.h ../../functions/upload.h -ticketinfo.o: ../../functions/uptime.h ../../functions/who.h -ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h -ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h -ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h -ticketinfo.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h +ticketinfo.o: ../../functions/specialdefault.h ../../functions/stat.h +ticketinfo.o: ../../functions/subject.h ../../functions/template.h +ticketinfo.o: ../../functions/tinymce.h ../../functions/uname.h +ticketinfo.o: ../../functions/upload.h ../../functions/uptime.h +ticketinfo.o: ../../functions/who.h ../../functions/vim.h +ticketinfo.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h +ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h +ticketinfo.o: ../../core/log.h ../../core/misc.h sessiondata.h +ticketinfo.o: ../../core/plugindata.h ../../functions/rm.h ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h ticketparser.o: ../../core/misc.h diff --git a/templates/Makefile.dep b/templates/Makefile.dep index d6ae1b1..8eeaee2 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -21,9 +21,9 @@ adduser.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h adduser.o: ../core/cur.h ../core/mounts.h ../core/mount.h -adduser.o: ../core/mountparser.h ../core/users.h ../core/groups.h -adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -adduser.o: ../core/basethread.h ../core/sessionmanager.h +adduser.o: ../core/mountparser.h ../core/crypt.h ../core/run.h +adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +adduser.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h adduser.o: ../core/request.h dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -46,19 +46,19 @@ dir.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h dir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h dir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h dir.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -dir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -dir.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h -dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h -dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h -dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -dir.o: ../functions/privchanger.h ../functions/chown.h -dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -dir.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -dir.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -dir.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h +dir.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +dir.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +dir.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +dir.o: ../core/htmlfilter.h ../core/misc.h ../functions/functions.h +dir.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h +dir.o: ../functions/functionparser.h ../functions/adduser.h +dir.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +dir.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h +dir.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +dir.o: ../functions/mv.h ../functions/node.h ../functions/priv.h +dir.o: ../functions/reload.h ../functions/rm.h ../functions/specialdefault.h dir.o: ../functions/stat.h ../functions/subject.h ../functions/template.h dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h dir.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h @@ -82,10 +82,10 @@ doc.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h doc.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h doc.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h doc.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -doc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -doc.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h -doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -doc.o: ../core/request.h ../core/misc.h +doc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +doc.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +doc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +doc.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -107,9 +107,9 @@ filters.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h filters.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h filters.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h filters.o: ../core/cur.h ../core/mounts.h ../core/mount.h -filters.o: ../core/mountparser.h ../core/users.h ../core/groups.h -filters.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -filters.o: ../core/basethread.h ../core/sessionmanager.h +filters.o: ../core/mountparser.h ../core/crypt.h ../core/run.h +filters.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +filters.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h filters.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h filters.o: ../core/misc.h htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h @@ -146,9 +146,9 @@ item.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h item.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h item.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -item.o: ../core/mount.h ../core/mountparser.h ../core/users.h -item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -item.o: ../core/basethread.h ../core/sessionmanager.h +item.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h ../core/run.h +item.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +item.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -171,9 +171,9 @@ last.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h last.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -last.o: ../core/mount.h ../core/mountparser.h ../core/users.h -last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -last.o: ../core/basethread.h ../core/sessionmanager.h +last.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h ../core/run.h +last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +last.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h @@ -204,10 +204,10 @@ ls.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h ls.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -ls.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -ls.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h -ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -ls.o: ../core/request.h +ls.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +ls.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +ls.o: ../core/htmlfilter.h ../core/request.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -228,9 +228,9 @@ misc.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h misc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h misc.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h -misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -misc.o: ../core/basethread.h ../core/sessionmanager.h +misc.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h ../core/run.h +misc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +misc.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h misc.o: ../core/misc.h ../core/request.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -254,8 +254,9 @@ mount.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h mount.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h mount.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -mount.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -mount.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h +mount.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +mount.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +mount.o: ../core/basethread.h ../core/sessionmanager.h mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h mount.o: ../core/misc.h patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h @@ -286,9 +287,9 @@ priv.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h priv.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h -priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -priv.o: ../core/basethread.h ../core/sessionmanager.h +priv.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h ../core/run.h +priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +priv.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h priv.o: ../core/request.h ../core/misc.h ../functions/functions.h priv.o: ../functions/functionbase.h ../core/synchro.h @@ -299,11 +300,10 @@ priv.o: ../functions/default.h ../functions/download.h ../functions/emacs.h priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h priv.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h priv.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -priv.o: ../functions/reload.h ../functions/rm.h ../functions/run.h -priv.o: ../functions/specialdefault.h ../functions/stat.h -priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h -priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -priv.o: ../functions/who.h ../functions/vim.h +priv.o: ../functions/reload.h ../functions/rm.h ../functions/specialdefault.h +priv.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +priv.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -325,8 +325,9 @@ rebus.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h rebus.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h rebus.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h rebus.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -rebus.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -rebus.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h +rebus.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +rebus.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +rebus.o: ../core/basethread.h ../core/sessionmanager.h rebus.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h @@ -348,9 +349,9 @@ stat.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h stat.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -stat.o: ../core/mount.h ../core/mountparser.h ../core/users.h -stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -stat.o: ../core/basethread.h ../core/sessionmanager.h +stat.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h ../core/run.h +stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +stat.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: ../core/request.h ../core/misc.h sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -373,10 +374,10 @@ sys.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h sys.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h sys.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h sys.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -sys.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -sys.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h -sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -sys.o: ../core/request.h ../core/version.h +sys.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +sys.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +sys.o: ../core/htmlfilter.h ../core/request.h ../core/version.h template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -398,11 +399,11 @@ template.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h template.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -template.o: ../core/mount.h ../core/mountparser.h ../core/users.h -template.o: ../core/groups.h ../core/group.h ../core/loadavg.h -template.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h -template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -template.o: ../core/misc.h +template.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h +template.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h +template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +template.o: ../core/sessionmanager.h ../core/sessioncontainer.h +template.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -425,13 +426,13 @@ templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h templates.o: ../notify/templatesnotify.h ../core/users.h templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -templates.o: ../core/users.h ../core/groups.h ../core/group.h -templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h -templates.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h -templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h -templates.o: ../functions/functions.h ../functions/functionbase.h -templates.o: ../core/request.h ../core/synchro.h +templates.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +templates.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +templates.o: ../core/basethread.h ../core/sessionmanager.h +templates.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +templates.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h +templates.o: ../core/sessionmanager.h ../functions/functions.h +templates.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h templates.o: ../functions/functionparser.h ../functions/adduser.h templates.o: ../functions/cat.h ../functions/chmod.h templates.o: ../functions/privchanger.h ../functions/chown.h @@ -440,12 +441,11 @@ templates.o: ../functions/download.h ../functions/emacs.h ../functions/last.h templates.o: ../functions/login.h ../functions/logout.h ../functions/ln.h templates.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h templates.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -templates.o: ../functions/rm.h ../functions/run.h -templates.o: ../functions/specialdefault.h ../functions/stat.h -templates.o: ../functions/subject.h ../functions/template.h -templates.o: ../functions/tinymce.h ../functions/uname.h -templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h -templates.o: ../functions/vim.h ../templates/templates.h +templates.o: ../functions/rm.h ../functions/specialdefault.h +templates.o: ../functions/stat.h ../functions/subject.h +templates.o: ../functions/template.h ../functions/tinymce.h +templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +templates.o: ../functions/who.h ../functions/vim.h ../templates/templates.h upload.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -467,8 +467,8 @@ upload.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h upload.o: ../core/cur.h ../core/mounts.h ../core/mount.h -upload.o: ../core/mountparser.h ../core/users.h ../core/groups.h -upload.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +upload.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h upload.o: ../core/basethread.h ../core/sessionmanager.h upload.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h upload.o: ../core/request.h @@ -493,8 +493,8 @@ uptime.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h uptime.o: ../core/cur.h ../core/mounts.h ../core/mount.h -uptime.o: ../core/mountparser.h ../core/users.h ../core/groups.h -uptime.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +uptime.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h uptime.o: ../core/basethread.h ../core/sessionmanager.h uptime.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -517,9 +517,9 @@ user.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h user.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h user.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h -user.o: ../core/mount.h ../core/mountparser.h ../core/users.h -user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -user.o: ../core/basethread.h ../core/sessionmanager.h +user.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h ../core/run.h +user.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +user.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h user.o: ../core/request.h ../core/misc.h who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -542,10 +542,10 @@ who.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h who.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -who.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -who.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h -who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -who.o: ../core/request.h ../core/misc.h +who.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +who.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +who.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +who.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -567,8 +567,9 @@ winix.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h winix.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h winix.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h winix.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h -winix.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -winix.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h +winix.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +winix.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +winix.o: ../core/basethread.h ../core/sessionmanager.h winix.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h winix.o: ../core/request.h ../core/plugin.h ../core/pluginmsg.h winix.o: ../core/sessionmanager.h ../functions/functions.h @@ -580,7 +581,7 @@ winix.o: ../functions/default.h ../functions/download.h ../functions/emacs.h winix.o: ../functions/last.h ../functions/login.h ../functions/logout.h winix.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h winix.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -winix.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +winix.o: ../functions/reload.h ../functions/rm.h winix.o: ../functions/specialdefault.h ../functions/stat.h winix.o: ../functions/subject.h ../functions/template.h winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h