PERFORCE change 155879 for review
Stacey Son
sson at FreeBSD.org
Fri Jan 9 13:55:23 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=155879
Change 155879 by sson at sson_amd64 on 2009/01/09 21:54:25
Fixes for launchd:
-Change launchd label to com.apple.auditd.
-Check for the correct audit condition in audit_quick_stop().
Affected files ...
.. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 edit
.. //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 edit
.. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $
*/
#include <sys/types.h>
@@ -83,7 +83,7 @@
#endif /* __BSM_INTERNAL_NOTIFY_KEY */
#ifndef __AUDIT_LAUNCHD_LABEL
-#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd"
+#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd"
#endif /* __AUDIT_LAUNCHD_LABEL */
#define MAX_MSG_SIZE 4096
@@ -100,7 +100,7 @@
if (debug)
opt = ASL_OPT_STDERR;
- au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt);
+ au_aslclient = asl_open("auditd", "com.apple.auditd", opt);
au_aslmsg = asl_new(ASL_TYPE_MSG);
#ifdef ASL_KEY_READ_UID
==== //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 (text+ko) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $
*/
#ifndef _BSM_AUDITD_LIB_H_
@@ -57,7 +57,7 @@
* Path of auditd plist file for launchd.
*/
#define AUDITD_PLIST_FILE \
- "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist"
+ "/System/Library/LaunchDaemons/com.apple.auditd.plist"
/*
* Error return codes for auditd_lib functions.
==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $
*/
#include <sys/param.h>
@@ -823,7 +823,7 @@
*/
if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0)
return (-1);
- if (cond == AUC_DISABLED)
+ if (cond == AUC_NOAUDIT)
return (0);
/*
More information about the p4-projects
mailing list