Changeset 454 for trunk/server/source3/nmbd/nmbd.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/nmbd/nmbd.c (modified) (3 diffs)

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();