Date: Mon, 11 Jul 2005 13:16:56 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79988 for review Message-ID: <200507111316.j6BDGu3h050656@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=79988 Change 79988 by rwatson@rwatson_zoo on 2005/07/11 13:16:29 Various NO_SEBSD build fixups. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#11 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#5 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#6 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#8 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#11 (text+ko) ==== @@ -80,9 +80,9 @@ #include <ttyent.h> #include <unistd.h> -#ifdef SEBSD #include <security/pam_appl.h> #include <security/openpam.h> +#ifdef SEBSD #include <selinux/selinux.h> #include <selinux/flask.h> #endif ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#5 (text+ko) ==== @@ -9,7 +9,7 @@ DPADD= ${LIBCRON} ${LIBUTIL} LDADD= ${LIBCRON} -lutil -.if !defined(SEBSD) +.if !defined(NO_SEBSD) CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -DSEBSD DPADD+= ${LIBSEBSD} ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#6 (text+ko) ==== @@ -30,9 +30,12 @@ #include <sys/file.h> #include <sys/mac.h> + +#ifdef SEBSD #include <selinux/selinux.h> #include <selinux/flask.h> #include <selinux/av_permissions.h> +#endif #define TMAX(a,b) ((a)>(b)?(a):(b)) ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#8 (text+ko) ==== @@ -33,7 +33,9 @@ # include <login_cap.h> #endif #include <sys/mac.h> +#ifdef SEBSD #include <selinux/selinux.h> +#endif static void child_process __P((entry *, user *)), @@ -307,10 +309,10 @@ e->envp); #ifdef SEBSD } +#endif /* !SEBSD */ warn("execl: couldn't exec `%s'", shell); _exit(ERROR_EXIT); } -#endif /* !SEBSD */ break; default: /* parent process */ ==== //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 (text+ko) ==== @@ -711,7 +711,11 @@ void +#ifdef SEBSD mv(char *from, char *to, const char *label) +#else +mv(char *from, char *to, __unused const char *label) +#endif { char buf[MAXPATHLEN];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507111316.j6BDGu3h050656>