Changeset 948 for trunk/server/lib/util/debug.c

Timestamp:

Aug 11, 2016, 9:18:14 AM (9 years ago)

Author:

dmik

Message:

samba server: Implement max log size with truncating when rename fails #2.

This fixes a wrong r947 commit.

File:

• trunk/server/lib/util/debug.c (modified) (3 diffs)

trunk/server/lib/util/debug.c

@@ -645 +645 @@
         int         maxlog;
         struct stat st;
+#ifdef __OS2__
+        int         force_trunc = 0;
+#endif
 
         /*
@@ -676 +679 @@
                                         return;
                                 }
+#ifdef __OS2__
+                                /* Renaming an open file is not possible on
+                                 * OS/2 so we close it and then rename. Note
+                                 * that if this log file is also in use by
+                                 * another process, rename will still fail; in
+                                 * this case we fall back to simply truncating
+                                 * the current file to stop its growth. */
+                                debug_close_fd(state.fd);
+                                state.fd = -1;
+                                if (rename(state.debugf, name) == -1) {
+                                        /* Most likely, some other samba process
+                                         * is using this log file. In either case
+                                         * our only option is to truncate it. */
+                                        force_trunc = 1;
+                                }
+                                if (reopen_logs_internal() && force_trunc) {
+                                        ftruncate(state.fd, 0);
+                                }
+#else
                                 (void)rename(state.debugf, name);
 
@@ -682 +704 @@
                                         (void)rename(name, state.debugf);
                                 }
+#endif
                                 SAFE_FREE(name);
                         }