diff options
| author | ru <ru@FreeBSD.org> | 2007-01-30 15:09:30 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2007-01-30 15:09:30 +0000 |
| commit | 4c53b68afc434a7e4e11a1248d9de532432d9858 (patch) | |
| tree | 19b18da2be6856863f157c4175f6225abd15a6cb /usr.sbin/pkg_install | |
| parent | 313e318cc86bcc065d525606a5898b7a7b8f41a2 (diff) | |
| download | FreeBSD-src-4c53b68afc434a7e4e11a1248d9de532432d9858.zip FreeBSD-src-4c53b68afc434a7e4e11a1248d9de532432d9858.tar.gz | |
Fix the logic bug that caused the custom versions of warn(3) and
warnx(3) to be compiled on systems that have it (e.g. FreeBSD),
while the intention was opposite, i.e., compile them on systems
that don't have them. Also fixes static linkage of pkg_sign(1).
Diffstat (limited to 'usr.sbin/pkg_install')
| -rw-r--r-- | usr.sbin/pkg_install/sign/main.c | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/sign/stand.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/sign/main.c b/usr.sbin/pkg_install/sign/main.c index c5068b7..0161efe 100644 --- a/usr.sbin/pkg_install/sign/main.c +++ b/usr.sbin/pkg_install/sign/main.c @@ -106,9 +106,9 @@ main(argc, argv, envp) int i; int type = TAG_ANY; -/* #ifndef BSD4_4 */ +#ifndef BSD4_4 set_program_name(argv[0]); -/* #endif */ +#endif #ifdef CHECKER_ONLY mode = CHECK; #else diff --git a/usr.sbin/pkg_install/sign/stand.c b/usr.sbin/pkg_install/sign/stand.c index 703c58d..98e4b47 100644 --- a/usr.sbin/pkg_install/sign/stand.c +++ b/usr.sbin/pkg_install/sign/stand.c @@ -3,7 +3,7 @@ __FBSDID("$FreeBSD$"); #include "stand.h" -#ifdef BSD4_4 +#ifndef BSD4_4 #include <string.h> #include <stdio.h> #include <errno.h> |
