Changeset 465

Timestamp:

Jun 11, 2010, 9:53:40 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: fixed the changing logname in nmbd

Location:

trunk/server/source3

Files:

• lib/select.c (modified) (1 diff)
• nmbd/nmbd.c (modified) (2 diffs)
• nmbd/nmbd_subnetdb.c (modified) (1 diff)

trunk/server/source3/lib/select.c

@@ -110 +110 @@
         errno = 0;
         ret = select(maxfd,readfds2,writefds,errorfds,tval);
-// @todo why are the above fd_set broken
+
         if (ret <= 0) {
                 FD_ZERO(readfds2);

trunk/server/source3/nmbd/nmbd.c

@@ -390 +390 @@
 
 #ifdef __OS2__
-        /* restore the logfile to log.nmbd if !override_logfile */
-        if (!override_logfile) {
+        /* restore the logfile to log.nmbd always */
                 char *lfile = NULL;
                 if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) {
@@ -398 +397 @@
                 lp_set_logfile(lfile);
                 SAFE_FREE(lfile);
-        }
 #endif
 

trunk/server/source3/nmbd/nmbd_subnetdb.c

@@ -111 +111 @@
                 set_socket_options(nmb_sock,"SO_BROADCAST");
                 set_blocking(nmb_sock, false);
-
+bind_bcast = false;      // @todo why does it not work
                 if (bind_bcast) {
                         nmb_bcast = open_socket_in(SOCK_DGRAM, global_nmb_port,