refclock_shm.c, ChangeLog:

  Bug-1397: shmget() failing because of file mode

bk: 4b0d8338UDXLKKZg4INay38Zjzf3Iw

diff --git a/ChangeLog b/ChangeLog
index 23a279be538398e3d89e21e4dc29f44715fd5e78..c122d04d9ac6d496801ea3a47704a0abbbea849b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1397] shmget() refclock_shm failing because of file mode
 (4.2.5p247-RC) 2009/11/20 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1142] nodebug builds shed no light on -d, -D option failure.
 * [Bug 1179] point out the problem with -i/--jaildir and -u/--user when

diff --git a/ntpd/refclock_shm.c b/ntpd/refclock_shm.c
index d2fe2c584722acd3915ca3e32118bb08d4d99141..c110c3826da0741e3e83b62f82a36359d3222824 100644 (file)
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -118,7 +118,7 @@ struct shmTime *getShmTime (int unit) {
         * as long as everybody does it the same way. 
         */
        shmid=shmget (0x4e545030+unit, sizeof (struct shmTime), 
-                     IPC_CREAT|(unit<2?0700:0777));
+                     IPC_CREAT|(unit<2?0600:0666));
        if (shmid==-1) { /*error */
                msyslog(LOG_ERR,"SHM shmget (unit %d): %s",unit,strerror(errno));
                return 0;