Attachment #204206 for bug #283919

View | Details | Raw Unified | Return to bug 283919
Collapse All | Expand All

Lines 166-176 Link Here

(-)samba-3.3.7.original/source/smbd/dnsregister.c (-1 / +1 lines)
166	bool dns_register_smbd_reply(struct dns_reg_state *dns_state,	166	bool dns_register_smbd_reply(struct dns_reg_state *dns_state,
167	fd_set lfds, struct timeval timeout)	167	fd_set lfds, struct timeval timeout)
168	{	168	{
169	int mdnsd_conn_fd = -1;	169	int mdnsd_conn_fd = -1;
170		170
171	if (dns_state->srv_ref == NULL) {	171	if ((dns_state == NULL) \|\| (dns_state->srv_ref == NULL)) {
172	return false;	172	return false;
173	}	173	}
174		174
175	mdnsd_conn_fd = DNSServiceRefSockFD(dns_state->srv_ref);	175	mdnsd_conn_fd = DNSServiceRefSockFD(dns_state->srv_ref);
176		176




		memcpy((char *)&r_fds, (char *)&listen_set,
		       sizeof(listen_set));
		FD_ZERO(&w_fds);
		GetTimeOfDay(&now);

		/* Kick off our mDNS registration. */
		if (dns_port != 0) {
			dns_register_smbd(&dns_reg, dns_port, &maxfd,
					&r_fds, &idle_timeout);
		}

		event_add_to_select_args(smbd_event_context(), &now,
					 &r_fds, &w_fds, &idle_timeout,
					 &maxfd);

		num = sys_select(maxfd+1,&r_fds,&w_fds,NULL,

Return to bug 283919

Lines 650-659 Link Here

(-)samba-3.3.7.original/source/smbd/server.c (+6 lines)
650	memcpy((char )&r_fds, (char )&listen_set,	650	memcpy((char )&r_fds, (char )&listen_set,
651	sizeof(listen_set));	651	sizeof(listen_set));
652	FD_ZERO(&w_fds);	652	FD_ZERO(&w_fds);
653	GetTimeOfDay(&now);	653	GetTimeOfDay(&now);
654		654
		655	/* Kick off our mDNS registration. */
		656	if (dns_port != 0) {
		657	dns_register_smbd(&dns_reg, dns_port, &maxfd,
		658	&r_fds, &idle_timeout);
		659	}
		660
655	event_add_to_select_args(smbd_event_context(), &now,	661	event_add_to_select_args(smbd_event_context(), &now,
656	&r_fds, &w_fds, &idle_timeout,	662	&r_fds, &w_fds, &idle_timeout,
657	&maxfd);	663	&maxfd);
658		664
659	num = sys_select(maxfd+1,&r_fds,&w_fds,NULL,	665	num = sys_select(maxfd+1,&r_fds,&w_fds,NULL,