Merge branch 'master' of rtime.felk.cvut.cz:frescor/fwp

Conflicts:
	fwp/mngr/fwp_mngr.c

diff --cc fwp/mngr/fwp_mngr.c
index 1b66aacd5efd4176b7c39d5c302423423cdb554b,233215ddff03db9b9bae0f8962b36a021507935f..c94328ae063c82f4907b01f912e9794f2203335e
--- 1/fwp/mngr/fwp_mngr.c
--- 2/fwp/mngr/fwp_mngr.c
+++ b/fwp/mngr/fwp_mngr.c
@@@ -129,8 -130,12 +131,12 @@@ int main(int argc, char *argv[]
                priv.bypass = true;
  
  
-       while ((opt = getopt_long(argc, argv, "b:hl:os", &long_opts[0], NULL)) != EOF) {
 -      while ((opt = getopt_long(argc, argv, "b:l:hos", &long_opts[0], NULL)) != EOF) {
++      while ((opt = getopt_long(argc, argv, "b:d:hl:os", &long_opts[0], NULL)) != EOF) {
                switch (opt) {
+                       case 'd':
+                               opt_daemon = true;
+                               opt_pidfile = optarg;
+                               break;
                        case 'l':
                                ul_log_domain_arg2levels(optarg);
                                break;