[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc1-144-g807365d

Karolin Seeger kseeger at samba.org
Fri Dec 12 16:59:37 GMT 2008


The branch, v3-3-stable has been updated
       via  807365d2cb15ea468e53449023299d17914b68dc (commit)
      from  150c16821ba4d66a81de1716b78c4d59bd8d8dd4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -----------------------------------------------------------------
commit 807365d2cb15ea468e53449023299d17914b68dc
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date:   Fri Dec 12 17:43:51 2008 +0100

    winbindd: vars for signals must be volatile sig_atomic_t
    (cherry picked from commit 6ffff93aa3d6e2ecf8716ad44db614cb746d1b56)

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 4ab03f5..b843ac0 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -173,35 +173,35 @@ static void terminate(bool is_parent)
 	exit(0);
 }
 
-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);
 }
 
@@ -224,7 +224,7 @@ static void msg_shutdown(struct messaging_context *msg,
 			 struct server_id server_id,
 			 DATA_BLOB *data)
 {
-	do_sigterm = True;
+	do_sigterm = 1;
 }
 
 
@@ -802,7 +802,7 @@ void winbind_check_sighup(const char *lfile)
 		flush_caches();
 		reload_services_file(lfile);
 
-		do_sighup = False;
+		do_sighup = 0;
 	}
 }
 
@@ -977,13 +977,13 @@ static void process_loop(void)
 
 	if (do_sigusr2) {
 		print_winbindd_status();
-		do_sigusr2 = False;
+		do_sigusr2 = 0;
 	}
 
 	if (do_sigchld) {
 		pid_t pid;
 
-		do_sigchld = False;
+		do_sigchld = 0;
 
 		while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
 			winbind_child_died(pid);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list