components/ntp/patches/30-zsavewarn.patch
author Brian Utterback <brian.utterback@oracle.com>
Thu, 13 Apr 2017 17:10:44 -0700
changeset 7955 e2e23e69f5e7
parent 7415 776fca839043
permissions -rw-r--r--
25729484 ntpq --version broken in s11.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7415
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     1
This bug has been reported as NTP community bug 3103 zsave_warn format string
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     2
used without arguments.
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     3
http://bugs.ntp.org/show_bug.cgi?id=3103
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     4
This patch may be removed after upgrading to a version of NTP that has
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     5
bug 3103 fixed.
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     6
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     7
*** sntp/libopts/save.c
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     8
--- sntp/libopts/save.c
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
     9
*************** find_dir_name(tOptions * opts, int * p_f
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    10
*** 128,134 ****
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    11
          }
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    12
  
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    13
          if (pzEnv == NULL) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    14
!             fprintf(stderr, zsave_warn, opts->pzProgName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    15
              fprintf(stderr, zNotDef, pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    16
              return NULL;
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    17
          }
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    18
--- 128,134 ----
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    19
          }
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    20
  
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    21
          if (pzEnv == NULL) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    22
!             fprintf(stderr, zsave_warn, opts->pzProgName, "\"\"");
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    23
              fprintf(stderr, zNotDef, pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    24
              return NULL;
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    25
          }
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    26
*************** find_file_name(tOptions * opts, int * p_
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    27
*** 180,186 ****
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    28
           */
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    29
          if (errno != ENOENT) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    30
          bogus_name:
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    31
!             fprintf(stderr, zsave_warn, opts->pzProgName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    32
              fprintf(stderr, zNoStat, errno, strerror(errno), pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    33
              if (free_dir_name)
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    34
                  AGFREE(pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    35
--- 180,186 ----
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    36
           */
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    37
          if (errno != ENOENT) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    38
          bogus_name:
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    39
!             fprintf(stderr, zsave_warn, opts->pzProgName,pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    40
              fprintf(stderr, zNoStat, errno, strerror(errno), pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    41
              if (free_dir_name)
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    42
                  AGFREE(pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    43
*************** find_file_name(tOptions * opts, int * p_
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    44
*** 234,240 ****
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    45
           */
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    46
          if (stat(pzDir, &stBuf) != 0) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    47
              if (errno != ENOENT) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    48
!                 fprintf(stderr, zsave_warn, opts->pzProgName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    49
                  fprintf(stderr, zNoStat, errno, strerror(errno),
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    50
                          pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    51
                  AGFREE(pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    52
--- 234,240 ----
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    53
           */
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    54
          if (stat(pzDir, &stBuf) != 0) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    55
              if (errno != ENOENT) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    56
!                 fprintf(stderr, zsave_warn, opts->pzProgName, pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    57
                  fprintf(stderr, zNoStat, errno, strerror(errno),
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    58
                          pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    59
                  AGFREE(pzDir);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    60
*************** open_sv_file(tOptions * opts)
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    61
*** 531,537 ****
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    62
  
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    63
          fp = fopen(pzFName, "w" FOPEN_BINARY_FLAG);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    64
          if (fp == NULL) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    65
!             fprintf(stderr, zsave_warn, opts->pzProgName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    66
              fprintf(stderr, zNoCreat, errno, strerror(errno), pzFName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    67
              if (free_name)
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    68
                  AGFREE(pzFName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    69
--- 531,537 ----
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    70
  
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    71
          fp = fopen(pzFName, "w" FOPEN_BINARY_FLAG);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    72
          if (fp == NULL) {
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    73
!             fprintf(stderr, zsave_warn, opts->pzProgName, pzFName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    74
              fprintf(stderr, zNoCreat, errno, strerror(errno), pzFName);
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    75
              if (free_name)
776fca839043 24571490 /usr/sbin/ntp-keygen crashes with SIGSEGV
Brian Utterback <brian.utterback@oracle.com>
parents:
diff changeset
    76
                  AGFREE(pzFName);