Changeset 620 for trunk/server/lib

Timestamp:

Aug 6, 2011, 6:50:53 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.11

Location:

trunk/server/lib

Files:

• replace/system/config.m4 (modified) (1 diff)
• replace/system/filesys.h (modified) (1 diff)
• replace/system/wait.h (modified) (1 diff)
• tevent/testsuite.c (modified) (1 diff)
• tevent/tevent_signal.c (modified) (1 diff)

trunk/server/lib/replace/system/config.m4

@@ -2 +2 @@
 AC_HEADER_DIRENT 
 AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
-AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h)
 
 # select

trunk/server/lib/replace/system/filesys.h

@@ -78 +78 @@
 #endif
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #ifdef HAVE_FCNTL_H

trunk/server/lib/replace/system/wait.h

@@ -45 +45 @@
 #endif
 
-#ifndef SA_RESETHAND
-#define SA_RESETHAND SA_ONESHOT
-#endif
-
 #if !defined(HAVE_SIG_ATOMIC_T_TYPE)
 typedef int sig_atomic_t;

trunk/server/lib/tevent/testsuite.c

@@ -102 +102 @@
         se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART, count_handler, &alarm_count);
 #endif
+#ifdef SA_RESETHAND
         se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND, count_handler, &alarm_count);
+#endif
 #ifdef SA_SIGINFO
         se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO, count_handler, &info_count);

trunk/server/lib/tevent/tevent_signal.c

@@ -363 +363 @@
                                                     se->private_data);
                                 }
+#ifdef SA_RESETHAND
                                 if (se->sa_flags & SA_RESETHAND) {
                                         talloc_free(se);
                                 }
+#endif
                                 continue;
                         }
 #endif
                         se->handler(ev, se, i, count, NULL, se->private_data);
+#ifdef SA_RESETHAND
                         if (se->sa_flags & SA_RESETHAND) {
                                 talloc_free(se);
                         }
+#endif
                 }