|
|
@@ -1,6 +1,7 @@
|
|
|
---- src/portfwd.cc.dist 2003-07-23 13:30:00.000000000 +0200
|
|
|
-+++ src/portfwd.cc 2003-07-23 14:22:44.000000000 +0200
|
|
|
-@@ -36,6 +36,8 @@
|
|
|
+Index: src/portfwd.cc
|
|
|
+--- src/portfwd.cc.orig 2005-05-30 04:13:28 +0200
|
|
|
++++ src/portfwd.cc 2005-07-03 20:10:59 +0200
|
|
|
+@@ -37,6 +37,8 @@
|
|
|
|
|
|
int on_the_fly_dns = 0;
|
|
|
int foreground = 0;
|
|
|
@@ -9,7 +10,7 @@
|
|
|
|
|
|
void usage(FILE *out)
|
|
|
{
|
|
|
-@@ -52,6 +54,7 @@
|
|
|
+@@ -53,6 +55,7 @@
|
|
|
" -f | --on-the-fly-dns\n"
|
|
|
" -g | --foreground\n"
|
|
|
" -c <config-file> | --config <config-file>\n",
|
|
|
@@ -17,7 +18,7 @@
|
|
|
prog);
|
|
|
}
|
|
|
|
|
|
-@@ -81,14 +84,16 @@
|
|
|
+@@ -82,14 +85,16 @@
|
|
|
{"on-the-fly-dns", 0, 0, 'f'},
|
|
|
{"foreground", 0, 0, 'g'},
|
|
|
{"config", 1, 0, 'c'},
|
|
|
@@ -35,7 +36,7 @@
|
|
|
if (opt == -1)
|
|
|
break;
|
|
|
|
|
|
-@@ -124,6 +129,13 @@
|
|
|
+@@ -125,6 +130,13 @@
|
|
|
}
|
|
|
*config = optarg;
|
|
|
break;
|
|
|
@@ -49,7 +50,7 @@
|
|
|
case '?':
|
|
|
usage(stderr);
|
|
|
exit(1);
|
|
|
-@@ -245,6 +257,9 @@
|
|
|
+@@ -246,6 +258,9 @@
|
|
|
|
|
|
closelog();
|
|
|
|
|
|
@@ -59,7 +60,7 @@
|
|
|
exit(0);
|
|
|
}
|
|
|
|
|
|
-@@ -290,7 +305,7 @@
|
|
|
+@@ -291,7 +306,7 @@
|
|
|
* Go to background.
|
|
|
*/
|
|
|
if (!foreground) {
|
|
|
@@ -68,9 +69,10 @@
|
|
|
if (dmz) {
|
|
|
syslog(LOG_ERR, "daemonize() failed: %d", dmz);
|
|
|
exit(1);
|
|
|
---- src/portfwd.h.dist 2003-07-23 13:32:46.000000000 +0200
|
|
|
-+++ src/portfwd.h 2003-07-23 13:32:56.000000000 +0200
|
|
|
-@@ -20,6 +20,7 @@
|
|
|
+Index: src/portfwd.h
|
|
|
+--- src/portfwd.h.orig 2005-05-30 04:13:28 +0200
|
|
|
++++ src/portfwd.h 2005-07-03 20:10:59 +0200
|
|
|
+@@ -18,6 +18,7 @@
|
|
|
|
|
|
extern int on_the_fly_dns;
|
|
|
extern int foreground;
|
|
|
@@ -78,9 +80,10 @@
|
|
|
|
|
|
#endif /* PORTFWD_H */
|
|
|
|
|
|
---- src/util.cc.dist 2003-07-23 13:40:04.000000000 +0200
|
|
|
-+++ src/util.cc 2003-07-23 14:15:35.000000000 +0200
|
|
|
-@@ -135,7 +135,7 @@
|
|
|
+Index: src/util.cc
|
|
|
+--- src/util.cc.orig 2005-05-30 04:13:28 +0200
|
|
|
++++ src/util.cc 2005-07-03 20:10:59 +0200
|
|
|
+@@ -118,7 +118,7 @@
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -89,7 +92,7 @@
|
|
|
{
|
|
|
ONVERBOSE(syslog(LOG_INFO, "Daemonizing"));
|
|
|
|
|
|
-@@ -163,6 +163,20 @@
|
|
|
+@@ -146,6 +146,20 @@
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
@@ -110,25 +113,27 @@
|
|
|
/*
|
|
|
* Parent exits
|
|
|
*/
|
|
|
---- src/util.h.dist 2003-07-23 14:09:04.000000000 +0200
|
|
|
-+++ src/util.h 2003-07-23 14:09:13.000000000 +0200
|
|
|
-@@ -29,7 +29,7 @@
|
|
|
+Index: src/util.h
|
|
|
+--- src/util.h.orig 2005-05-30 04:13:28 +0200
|
|
|
++++ src/util.h 2005-07-03 20:10:59 +0200
|
|
|
+@@ -28,7 +28,7 @@
|
|
|
+
|
|
|
int cd_root();
|
|
|
- void close_fds(int first_fd);
|
|
|
int std_to_null();
|
|
|
-int daemonize();
|
|
|
+int daemonize(const char *pidfile);
|
|
|
|
|
|
void socket_close(int fd);
|
|
|
|
|
|
---- src/vector.hpp.dist 2002-09-06 20:04:04.000000000 +0200
|
|
|
-+++ src/vector.hpp 2004-06-21 17:57:30.000000000 +0200
|
|
|
-@@ -51,8 +51,6 @@
|
|
|
+Index: src/vector.hpp
|
|
|
+--- src/vector.hpp.orig 2005-06-28 23:46:27 +0200
|
|
|
++++ src/vector.hpp 2005-07-03 20:11:34 +0200
|
|
|
+@@ -55,8 +55,6 @@
|
|
|
T *begin_ptr() const;
|
|
|
T *past_end_ptr() const;
|
|
|
static T *next_ptr(T *i);
|
|
|
-
|
|
|
-- friend std::ostream& operator << <T> (std::ostream& out, const vector& v);
|
|
|
+- friend std::ostream& operator << <T> (std::ostream& out, const vector<T>& v);
|
|
|
};
|
|
|
|
|
|
template <class T>
|