From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 27 Jan 2011 10:27:38 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:frescor/fwp
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/fwp.git/commitdiff_plain/HEAD

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

Conflicts:
	fwp/mngr/fwp_mngr.c
---

898e54279f22559dd6acd2b7061bb36e8cb0975e
diff --cc fwp/mngr/fwp_mngr.c
index 1b66aac,233215d..c94328a
--- a/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;