Changeset 232 for branches/samba-3.2.x/source/winbindd/winbindd.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/winbindd/winbindd.c (modified) (8 diffs)

branches/samba-3.2.x/source/winbindd/winbindd.c

@@ -171 +171 @@
 }
 
-static bool do_sigterm;
+static SIG_ATOMIC_T do_sigterm = 0;
 
 static void termination_handler(int signum)
 {
-        do_sigterm = True;
+        do_sigterm = 1;
         sys_select_signal(signum);
 }
 
-static bool do_sigusr2;
+static SIG_ATOMIC_T do_sigusr2 = 0;
 
 static void sigusr2_handler(int signum)
 {
-        do_sigusr2 = True;
+        do_sigusr2 = 1;
         sys_select_signal(SIGUSR2);
 }
 
-static bool do_sighup;
+static SIG_ATOMIC_T do_sighup = 0;
 
 static void sighup_handler(int signum)
 {
-        do_sighup = True;
+        do_sighup = 1;
         sys_select_signal(SIGHUP);
 }
 
-static bool do_sigchld;
+static SIG_ATOMIC_T do_sigchld = 0;
 
 static void sigchld_handler(int signum)
 {
-        do_sigchld = True;
+        do_sigchld = 1;
         sys_select_signal(SIGCHLD);
 }
@@ -222 +222 @@
                          DATA_BLOB *data)
 {
-        do_sigterm = True;
+        do_sigterm = 1;
 }
 
@@ -747 +747 @@
 {
         char c = 0;
+        int nwritten;
 
         /* It's a dead client - hold a funeral */
@@ -755 +756 @@
 
         /* tell client, we are closing ... */
-        write(state->sock, &c, sizeof(c));
+        nwritten = write(state->sock, &c, sizeof(c));
+        if (nwritten == -1) {
+                DEBUG(2, ("final write to client failed: %s\n",
+                          strerror(errno)));
+        }
 
         /* Close socket */
@@ -823 +828 @@
                 reload_services_file(logfile);
 
-                do_sighup = False;
+                do_sighup = 0;
         }
 }
@@ -998 +1003 @@
         if (do_sigusr2) {
                 print_winbindd_status();
-                do_sigusr2 = False;
+                do_sigusr2 = 0;
         }
 
@@ -1004 +1009 @@
                 pid_t pid;
 
-                do_sigchld = False;
+                do_sigchld = 0;
 
                 while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
@@ -1218 +1223 @@
         TimeInit();
 
-        if (!reinit_after_fork(winbind_messaging_context(), false)) {
+        /* Don't use winbindd_reinit_after_fork here as
+         * we're just starting up and haven't created any
+         * winbindd-specific resources we must free yet. JRA.
+         */
+
+        if (!reinit_after_fork(winbind_messaging_context(),
+                               winbind_event_context(), false)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 exit(1);