Changeset 456 for trunk/server/lib/util

Timestamp:

Jun 7, 2010, 9:08:40 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changes from 3.3

Location:

trunk/server/lib/util

Files:

• become_daemon.c (modified) (1 diff)
• blocking.c (modified) (2 diffs)
• genrand.c (modified) (3 diffs)
• util.c (modified) (1 diff)

trunk/server/lib/util/become_daemon.c

@@ -69 +69 @@
 _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group)
 {
+#ifdef __OS2__
+// fork daemonize scheme not working in os/2, thus the parent process will currently kill and reap all children when it exits
+        do_fork = False;
+#endif
         if (do_fork) {
                 if (sys_fork()) {

trunk/server/lib/util/blocking.c

@@ -54 +54 @@
         if((val = fcntl(fd, F_GETFL, 0)) == -1)
                 return -1;
+#ifndef __OS2__
         if(set) /* Turn blocking on - ie. clear nonblock flag */
                 val &= ~FLAG_TO_SET;
@@ -59 +60 @@
                 val |= FLAG_TO_SET;
         return fcntl( fd, F_SETFL, val);
+#else
+        if(set) /* turn blocking on - ie. clear nonblock flag */
+                val = 0;
+        else
+                val = 1;
+        return os2_ioctl(fd, FIONBIO, (char *) &val, sizeof(val));
+#endif
+
 #undef FLAG_TO_SET
 }

trunk/server/lib/util/genrand.c

@@ -224 +224 @@
         unsigned char *p;
 
+#ifndef __OS2__
         if(!done_reseed) {
                 bytes_since_reseed += len;
@@ -242 +243 @@
                 done_reseed = true;
         }
+#endif
 
         /*
@@ -254 +256 @@
                 int copy_len = len > 16 ? 16 : len;
 
+#ifdef __OS2__
+                os2_randget(md4_buf, sizeof(md4_buf));
+#else
                 get_random_stream(md4_buf, sizeof(md4_buf));
+#endif
                 mdfour(tmp_buf, md4_buf, sizeof(md4_buf));
                 memcpy(p, tmp_buf, copy_len);

trunk/server/lib/util/util.c

@@ -223 +223 @@
         lock.l_pid = 0;
 
+/* @todo eventually insert lock code from 3.3 */
         ret = fcntl(fd,op,&lock);