whoson.patch 2.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. --- Makefile.in.dist Tue Apr 15 14:50:22 2003
  2. +++ Makefile.in Tue Apr 15 14:50:58 2003
  3. @@ -698,10 +698,10 @@
  4. install-data-hook:
  5. - if test -f $(DEFAULT_CONFIG); then \
  6. - $(ECHO) "$(DEFAULT_CONFIG) exists, not overwritten"; \
  7. + if test -f $(DESTDIR)$(DEFAULT_CONFIG); then \
  8. + $(ECHO) "$(DESTDIR)$(DEFAULT_CONFIG) exists, not overwritten"; \
  9. else \
  10. - $(INSTALL_DATA) $(srcdir)/whoson.conf $(DEFAULT_CONFIG); \
  11. + $(INSTALL_DATA) $(srcdir)/whoson.conf $(DESTDIR)$(DEFAULT_CONFIG); \
  12. fi; \
  13. for f in $(MAN3XTRA); do \
  14. rm -f $(DESTDIR)$(man3dir)/$$f; \
  15. --- whosond.c.dist Tue Apr 15 14:37:01 2003
  16. +++ whosond.c Tue Apr 15 14:38:32 2003
  17. @@ -153,6 +153,8 @@
  18. if (daemon) {
  19. int child;
  20. if ((child=fork()) > 0) {
  21. + printf("%d\n",child);
  22. + fflush(stdout);
  23. sleep(1);
  24. return 0;
  25. } else if (child < 0) {
  26. --- whoson.conf.dist Tue Apr 15 15:16:43 2003
  27. +++ whoson.conf Tue Apr 15 16:51:52 2003
  28. @@ -13,13 +13,13 @@
  29. # stream socket. "port" is the name of the socket.
  30. client unix
  31. - port=/var/run/whoson.s
  32. + port=@l_prefix@/var/whoson/run/whoson.s
  33. # Connect to the server running on the same machine via a unix domain
  34. # datagram socket. "port" is the name of the socket.
  35. client unixd
  36. - port=/var/run/whoson.d
  37. + port=@l_prefix@/var/whoson/run/whoson.d
  38. maxtries=5
  39. inittimeout=100000
  40. @@ -39,7 +39,7 @@
  41. # Connect to the server over the TCP protocol.
  42. client tcp port=9876
  43. - address=194.67.3.216
  44. + address=127.0.0.1
  45. # There may be any number of any type entries.
  46. # Stream protocols (tcp and unix) allow for persistent connections
  47. @@ -62,23 +62,25 @@
  48. port=9876
  49. listenq=5
  50. keepalive=150
  51. - allow=123.45.67.0/24 # Allow the the whole network
  52. - deny=123.45.67.89/32 # except these ..
  53. - deny=123.45.67.90/32 # .. two machines
  54. -server unix port=/var/run/whoson.s keepalive=150
  55. + #allow=123.45.67.0/24 # Allow the the whole network
  56. + #deny=123.45.67.89/32 # except these ..
  57. + #deny=123.45.67.90/32 # .. two machines
  58. + allow=127.0.0.1/32
  59. +server unix port=@l_prefix@/var/whoson/run/whoson.s keepalive=150
  60. listenq=5
  61. -server unixd port=/var/run/whoson.d
  62. +server unixd port=@l_prefix@/var/whoson/run/whoson.d
  63. server udp port=9876
  64. - allow=0.0.0.0/0 # open to the world. Don't do that!
  65. + #allow=0.0.0.0/0 # open to the world. Don't do that!
  66. + allow=127.0.0.1/32
  67. # "global" pseudo server that does not listen; it is only used to set
  68. # global configuration parameters. "ttl" - how many seconds
  69. # inserted entries will live in the database if not deleted explicitely.
  70. server global ttl=600 # 10 minutes
  71. - chroot=/some/empty/directory # chdir and chroot here
  72. - group=nobody # change group id and
  73. - user=nobody # user id after bind()ing
  74. - cachesize=100000 # max. number of entries to keep
  75. + chroot=@l_prefix@/var/whoson/empty/ # chdir and chroot here
  76. + group=@l_rgrp@ # change group id and
  77. + user=@l_rusr@ # user id after bind()ing
  78. + cachesize=100000 # max. number of entries to keep
  79. # end of config