← Back to branch summary

~ubuntu-branches/ubuntu/lucid/rsyslog/lucid-updates

« back to all changes in this revision

Viewing changes to runtime/net.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-06-23 12:12:43 UTC
  • mfrom: (1.1.11 upstream) (3.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090623121243-d2fejarzidywnn17
Tags: 4.2.0-1
http://bugs.debian.org/530228
* New upstream release of the now stable v4 branch.
  - Fix warnings when /etc/rsyslog.d/ is empty. Closes: #530228
* debian/patches/imudp_multiple_udp_sockets.patch
  - Removed, merged upstream.
* debian/rsyslog.default
  - Set default compat mode to '4'.
* debian/rsyslog.logcheck.ignore.server
  - Update logcheck rules files to also ignore rsyslogd and imklog stop
    messages.
* debian/control
  - Bump Standards-Version to 3.8.2. No further changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
runtime/net.c
63
63
#include "errmsg.h"
64
64
#include "net.h"
65
65
 
 
66
#ifdef OS_SOLARIS
 
67
#       define  s6_addr32       _S6_un._S6_u32
 
68
        typedef unsigned int    u_int32_t;
 
69
#endif
 
70
 
66
71
MODULE_TYPE_LIB
67
72
 
68
73
/* static data */
1233
1238
         * make this in option in the long term. (rgerhards, 2007-09-11)
1234
1239
         */
1235
1240
        strcpy((char*)pszHost, (char*)pszHostFQDN);
1236
 
        if ((p = (uchar*) strchr((char*)pszHost, '.'))) { /* find start of domain name "machine.example.com" */
 
1241
        if(   (glbl.GetPreserveFQDN() == 0)
 
1242
           && (p = (uchar*) strchr((char*)pszHost, '.'))) { /* find start of domain name "machine.example.com" */
 
1243
                strcmp((char*)(p + 1), (char*)glbl.GetLocalDomain());
1237
1244
                if(strcmp((char*)(p + 1), (char*)glbl.GetLocalDomain()) == 0) {
1238
1245
                        *p = '\0'; /* simply terminate the string */
1239
1246
                } else {