retire the old cron socket path; ok jca millert

diff --git a/usr.sbin/cron/client.c b/usr.sbin/cron/client.c
index a0ad3ca..8d7713a 100644 (file)
--- a/usr.sbin/cron/client.c
+++ b/usr.sbin/cron/client.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: client.c,v 1.8 2015/11/12 21:12:05 millert Exp $      */
+/*     $OpenBSD: client.c,v 1.9 2018/07/11 14:51:01 deraadt Exp $      */
 
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -99,9 +99,6 @@ poke_daemon(unsigned char cookie)
        struct stat sb;
        struct sockaddr_un s_un;
 
-       if (stat(cronsock, &sb) != 0)
-               cronsock = _PATH_CRON_SOCK_OLD; /* backwards compatibility */
-
        bzero(&s_un, sizeof(s_un));
        if (strlcpy(s_un.sun_path, cronsock, sizeof(s_un.sun_path)) >=
            sizeof(s_un.sun_path)) {

diff --git a/usr.sbin/cron/pathnames.h b/usr.sbin/cron/pathnames.h
index b745419..95cd6dd 100644 (file)
--- a/usr.sbin/cron/pathnames.h
+++ b/usr.sbin/cron/pathnames.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pathnames.h,v 1.22 2015/11/12 21:12:05 millert Exp $  */
+/*     $OpenBSD: pathnames.h,v 1.23 2018/07/11 14:51:01 deraadt Exp $  */
 
 /* Copyright 1993,1994 by Paul Vixie
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -28,7 +28,6 @@
 #define        _PATH_CRON_ALLOW        "/var/cron/cron.allow"
 #define        _PATH_CRON_DENY         "/var/cron/cron.deny"
 #define        _PATH_CRON_SOCK         "/var/run/cron.sock"
-#define        _PATH_CRON_SOCK_OLD     "/var/cron/tabs/.sock"
 #define        _PATH_CRON_SPOOL        "/var/cron/tabs"
 #define        _PATH_SYS_CRONTAB       "/etc/crontab"