← Back to branch summary

~cyphermox/ubuntu/precise/dnsmasq/dbus

« back to all changes in this revision

Viewing changes to src/dnsmasq.c

  • Committer: Package Import Robot
  • Author(s): Simon Kelley
  • Date: 2011-09-15 16:33:23 UTC
  • mfrom: (12.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20110915163323-cf1q0y1t6r3xyjkp
Tags: 2.58-3
http://bugs.debian.org/641717
http://bugs.debian.org/640095
 * Fix resolvconf script location. (closes: #641717)
 * Update systemd service file. (closes: #640095)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dnsmasq.c
40
40
#ifndef LOCALEDIR
41
41
"no-"
42
42
#endif
43
 
"I18N "
 
43
"i18n "
44
44
#ifndef HAVE_DHCP
45
45
"no-"
46
46
#endif
52
52
"no-"
53
53
#endif
54
54
"TFTP "
 
55
#ifndef HAVE_CONNTRACK
 
56
"no-"
 
57
#endif
 
58
"conntrack "
55
59
#if !defined(LOCALEDIR) && !defined(HAVE_IDN)
56
60
"no-"
57
61
#endif 
148
152
    die(_("TFTP server not available: set HAVE_TFTP in src/config.h"), NULL, EC_BADCONF);
149
153
#endif
150
154
 
 
155
#ifdef HAVE_CONNTRACK
 
156
  if (option_bool(OPT_CONNTRACK) && (daemon->query_port != 0 || daemon->osport))
 
157
    die (_("Cannot use --conntrack AND --query-port"), NULL, EC_BADCONF); 
 
158
#else
 
159
  if (option_bool(OPT_CONNTRACK))
 
160
    die(_("Conntrack support not available: set HAVE_CONNTRACK in src/config.h"), NULL, EC_BADCONF);
 
161
#endif
 
162
 
151
163
#ifdef HAVE_SOLARIS_NETWORK
152
164
  if (daemon->max_logs != 0)
153
165
    die(_("asychronous logging is not available under Solaris"), NULL, EC_BADCONF);
1147
1159
              unsigned char *buff;
1148
1160
              struct server *s; 
1149
1161
              int flags;
1150
 
              struct in_addr dst_addr_4;
1151
 
              
1152
 
              dst_addr_4.s_addr = 0;
1153
1162
              
1154
1163
#ifndef NO_FORK
1155
1164
              /* Arrange for SIGALARM after CHILD_LIFETIME seconds to
1168
1177
              if ((flags = fcntl(confd, F_GETFL, 0)) != -1)
1169
1178
                fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
1170
1179
              
1171
 
              if (listener->family == AF_INET)
1172
 
                dst_addr_4 = iface->addr.in.sin_addr;
1173
 
              
1174
 
              buff = tcp_request(confd, now, dst_addr_4, iface->netmask);
 
1180
              buff = tcp_request(confd, now, &iface->addr, iface->netmask);
1175
1181
               
1176
1182
              shutdown(confd, SHUT_RDWR);
1177
1183
              close(confd);