Changeset 454 for trunk/server/source3/nmbd

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

Location:

trunk/server/source3/nmbd

Files:

• asyncdns.c (modified) (1 diff)
• nmbd.c (modified) (3 diffs)
• nmbd_serverlistdb.c (modified) (2 diffs)
• nmbd_winsserver.c (modified) (1 diff)

trunk/server/source3/nmbd/asyncdns.c

@@ -141 +141 @@
         CatchChild();
 
+#ifdef __OS2__ // cant use pipes here, because select() from innotek lib does work only for sockets.
+        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd1) < 0)
+        {
+                DEBUG(0,("can't create asyncdns socketpair1 %d\n", errno));
+                return;         
+        }
+        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd2) < 0)
+        {
+                DEBUG(0,("can't create asyncdns socketpair2 %d\n", errno));
+                close(fd1[0]);
+                close(fd1[1]);
+                return;         
+        }
+        DEBUG(9,("!!!!!!PIPES %d %d %d %d\n", fd1[0], fd1[1], fd2[0], fd2[1]));
+#else
         if (pipe(fd1) || pipe(fd2)) {
                 DEBUG(0,("can't create asyncdns pipes\n"));
                 return;
         }
+#endif
 
         child_pid = sys_fork();

trunk/server/source3/nmbd/nmbd.c

@@ -30 +30 @@
 extern bool global_in_nmbd;
 
+#ifdef __OS2__
+extern int global_Sem32Add;
+#endif
+
 extern bool override_logfile;
 
@@ -384 +388 @@
                 reload_nmbd_services( True );
         }
+
+#ifdef __OS2__
+        /* restore the logfile to log.nmbd if !override_logfile */
+        if (!override_logfile) {
+                char *lfile = NULL;
+                if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) {
+                        exit(1);
+                }
+                lp_set_logfile(lfile);
+                SAFE_FREE(lfile);
+        }
+#endif
 
         return(ret);
@@ -776 +792 @@
         TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
 
+#ifdef __OS2__
+        global_Sem32Add = 1;
+#endif
+
         load_case_tables();
 

trunk/server/source3/nmbd/nmbd_serverlistdb.c

@@ -331 +331 @@
                 return;
         }
+#ifndef __OS2__
         fnamenew = talloc_asprintf(ctx, "%s.",
+#else
+        fnamenew = talloc_asprintf(ctx, "%s.tmp",
+#endif
                                 fname);
         if (!fnamenew) {
@@ -418 +422 @@
 
         x_fclose(fp);
+#ifdef __OS2__
+        close(fp);
+#endif
         unlink(fname);
         chmod(fnamenew,0644);

trunk/server/source3/nmbd/nmbd_winsserver.c

@@ -2389 +2389 @@
 
         x_fclose(fp);
+#ifdef __OS2__
+        close(fp);
+#endif
         chmod(fnamenew,0644);
         unlink(fname);