diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2007-05-01 16:32:07 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2007-05-01 16:32:07 +0000 |
| commit | 865944a235d7451dea683f7d3f7493bc07c3543f (patch) | |
| tree | 984ae8e0b8d58ec032510695bf25315a07aef29d /usr.sbin | |
| parent | 7fec95989520cc199d1739ad05ae3a1ff69543f0 (diff) | |
remove #ifndef SUN_LEN; ok millert@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/lpr/common_source/startdaemon.c | 7 | ||||
| -rw-r--r-- | usr.sbin/lpr/lpd/lpd.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c index 2ee321f9a3b..c264340b1fe 100644 --- a/usr.sbin/lpr/common_source/startdaemon.c +++ b/usr.sbin/lpr/common_source/startdaemon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: startdaemon.c,v 1.11 2007/05/01 13:12:32 stevesk Exp $ */ +/* $OpenBSD: startdaemon.c,v 1.12 2007/05/01 16:32:06 stevesk Exp $ */ /* $NetBSD: startdaemon.c,v 1.10 1998/07/18 05:04:39 lukem Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static const char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94"; #else -static const char rcsid[] = "$OpenBSD: startdaemon.c,v 1.11 2007/05/01 13:12:32 stevesk Exp $"; +static const char rcsid[] = "$OpenBSD: startdaemon.c,v 1.12 2007/05/01 16:32:06 stevesk Exp $"; #endif #endif /* not lint */ @@ -72,9 +72,6 @@ startdaemon(char *printer) memset(&un, 0, sizeof(un)); un.sun_family = AF_LOCAL; strlcpy(un.sun_path, _PATH_SOCKETNAME, sizeof(un.sun_path)); -#ifndef SUN_LEN -#define SUN_LEN(unp) (strlen((unp)->sun_path) + 2) -#endif siginterrupt(SIGINT, 1); PRIV_START; if (connect(s, (struct sockaddr *)&un, SUN_LEN(&un)) < 0) { diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index cefff07f5d1..3dde1dc8b4d 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpd.c,v 1.44 2004/04/07 14:09:35 aaron Exp $ */ +/* $OpenBSD: lpd.c,v 1.45 2007/05/01 16:32:06 stevesk Exp $ */ /* $NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $ */ /* @@ -41,7 +41,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpd.c,v 1.44 2004/04/07 14:09:35 aaron Exp $"; +static const char rcsid[] = "$OpenBSD: lpd.c,v 1.45 2007/05/01 16:32:06 stevesk Exp $"; #endif #endif /* not lint */ @@ -310,9 +310,6 @@ main(int argc, char **argv) memset(&un, 0, sizeof(un)); un.sun_family = AF_LOCAL; strlcpy(un.sun_path, _PATH_SOCKETNAME, sizeof(un.sun_path)); -#ifndef SUN_LEN -#define SUN_LEN(unp) (strlen((unp)->sun_path) + 2) -#endif PRIV_START; if (bind(funix, (struct sockaddr *)&un, SUN_LEN(&un)) < 0) { syslog(LOG_ERR, "ubind: %m"); |