diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-08-23 14:58:31 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-08-23 14:58:31 +0000 |
| commit | cf94663e69b2c927e4a44dcb922c93483f11bc29 (patch) | |
| tree | f43a461c97f3db054606f6367939a61652f0db97 /libexec | |
| parent | 2e65f120c886a9d09b274b1953783df2b995e799 (diff) | |
| parent | 19be009a4f8eb0d239ec3e465b0a9b2a2947dcf8 (diff) | |
| download | FreeBSD-src-cf94663e69b2c927e4a44dcb922c93483f11bc29.zip FreeBSD-src-cf94663e69b2c927e4a44dcb922c93483f11bc29.tar.gz | |
Sync to HEAD@r270409.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/getty/main.c | 2 | ||||
| -rw-r--r-- | libexec/mail.local/Makefile | 2 | ||||
| -rw-r--r-- | libexec/rshd/rshd.c | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/Makefile | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/libmap.c | 4 | ||||
| -rw-r--r-- | libexec/smrsh/Makefile | 2 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 2 |
7 files changed, 4 insertions, 12 deletions
diff --git a/libexec/getty/main.c b/libexec/getty/main.c index c9d2093..94ecb07 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -187,7 +187,7 @@ main(int argc, char *argv[]) signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN); - openlog("getty", LOG_ODELAY|LOG_CONS|LOG_PID, LOG_AUTH); + openlog("getty", LOG_CONS|LOG_PID, LOG_AUTH); gethostname(hostname, sizeof(hostname) - 1); hostname[sizeof(hostname) - 1] = '\0'; if (hostname[0] == '\0') diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index dff4238..3e59609 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -9,8 +9,6 @@ SRCS= mail.local.c MAN= mail.local.8 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -NO_PIE= yes - WARNS?= 2 WFORMAT=0 diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 7cdacae..b315040 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -127,7 +127,7 @@ main(int argc, char *argv[]) int ch, on = 1; struct sockaddr_storage from; - openlog("rshd", LOG_PID | LOG_ODELAY, LOG_DAEMON); + openlog("rshd", LOG_PID, LOG_DAEMON); opterr = 0; while ((ch = getopt(argc, argv, OPTIONS)) != -1) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 48e86f7..6e35d47 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -78,8 +78,6 @@ beforeinstall: .PATH: ${.CURDIR}/${RTLD_ARCH} -NO_PIE= yes - .if ${MK_TESTS} != "no" SUBDIR+= tests .endif diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c index 8b5faf8..691ad52 100644 --- a/libexec/rtld-elf/libmap.c +++ b/libexec/rtld-elf/libmap.c @@ -216,14 +216,14 @@ lmc_parse(char *lm_p, size_t lm_len) p = NULL; while (cnt < lm_len) { i = 0; - while (lm_p[cnt] != '\n' && cnt < lm_len && + while (cnt < lm_len && lm_p[cnt] != '\n' && i < sizeof(line) - 1) { line[i] = lm_p[cnt]; cnt++; i++; } line[i] = '\0'; - while (lm_p[cnt] != '\n' && cnt < lm_len) + while (cnt < lm_len && lm_p[cnt] != '\n') cnt++; /* skip over nl */ cnt++; diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 9f0bfd4..ae86155 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -9,8 +9,6 @@ SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -NO_PIE= yes - LIBSMDIR= ${.OBJDIR}/../../lib/libsm LIBSM= ${LIBSMDIR}/libsm.a diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index f80bf5c..690b03c 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -20,8 +20,6 @@ WFORMAT?= 0 CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DSTREAMSPTY -NO_PIE= yes - .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif |
