diff options
| author | Michael Biebl <biebl@debian.org> | 2008-03-29 12:14:35 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2008-03-29 12:14:35 +0100 |
| commit | 4c6437ca18921f789bb02f527a1449d2c7a951a5 (patch) | |
| tree | a9ed5b761c48918e1da0e5f6de6d8e96d98c4f9e /debian/patches | |
| parent | b0dbc76eaaf1c7f51b3aea1ea359b3a7e9882d20 (diff) | |
| download | rsyslog-4c6437ca18921f789bb02f527a1449d2c7a951a5.tar.gz | |
Imported Debian patch 1.19.7-2debian/1.19.7-2
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/udp_msg_reception.patch | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index f6e71f8..cc77b34 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ ignore_non_conf_files.patch -p0 no_create_db.patch man_page_format.patch -p0 +udp_msg_reception.patch -p0 diff --git a/debian/patches/udp_msg_reception.patch b/debian/patches/udp_msg_reception.patch new file mode 100644 index 0000000..b8ab15c --- /dev/null +++ b/debian/patches/udp_msg_reception.patch @@ -0,0 +1,48 @@ +--- net.c 2007/09/24 13:32:25 1.9 ++++ net.c 2007/09/26 12:28:56 1.10 +@@ -190,8 +190,11 @@ + } + + finalize_it: ++dbgprintf("hname() iRet: %d\n", iRet); + return iRet; + } ++ ++ + /* Return a printable representation of a host address. + * Now (2007-07-16) also returns the full host name (if it could be obtained) + * in the second param [thanks to mildew@gmail.com for the patch]. +@@ -242,7 +245,6 @@ + if ((p = (uchar*) strchr((char*)pszHost, '.'))) { /* find start of domain name "machine.example.com" */ + if(strcmp((char*) (p + 1), LocalDomain) == 0) { + *p = '\0'; /* simply terminate the string */ +- return 1; + } else { + /* now check if we belong to any of the domain names that were specified + * in the -s command line option. If so, remove and we are done. +@@ -252,7 +254,7 @@ + while (StripDomains[count]) { + if (strcmp((char*)(p + 1), StripDomains[count]) == 0) { + *p = '\0'; +- return 1; ++ FINALIZE; /* we are done */ + } + count++; + } +@@ -270,7 +272,7 @@ + while (LocalHosts[count]) { + if (!strcmp((char*)pszHost, LocalHosts[count])) { + *p = '\0'; +- return 1; ++ break; /* we are done */ + } + count++; + } +@@ -279,6 +281,7 @@ + } + + finalize_it: ++dbgprintf("cvthname() iRet: %d\n", iRet); + return iRet; + } + |