Date: Wed, 15 Feb 2006 18:36:49 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91821 for review Message-ID: <200602151836.k1FIanac034356@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91821 Change 91821 by millert@millert_g4tower on 2006/02/15 18:36:40 Fix some whitespace issues introduced by "diff -wu" when updating from the SEFOS tree. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#3 (text+ko) ==== @@ -127,7 +127,7 @@ - (void) policyWillLogin { free(username); if (label != NULL) /* XXX */ - mac_free(label); + mac_free(label); } - (void) policyWillLogout { return; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#8 (text+ko) ==== @@ -2057,7 +2057,7 @@ printf("ipc_kmsg_copyout_header: can't grow user ipc space\n"); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); - } + } } /* space is locked again; start over */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#4 (text+ko) ==== @@ -631,8 +631,8 @@ { kdp_handle_arp(); return; - } } + } if (pkt.len < (sizeof (struct ether_header) + sizeof (struct udpiphdr))) return; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#4 (text+ko) ==== @@ -76,9 +76,9 @@ if (fp == NULL) return errno; - fseek (fp, 0, SEEK_END); - la.len = ftell (fp); - fseek (fp, 0, SEEK_SET); + fseek(fp, 0, SEEK_END); + la.len = ftell(fp); + fseek(fp, 0, SEEK_SET); if ((la.data = malloc (la.len)) == NULL) return (ENOMEM); if (fread(la.data, la.len, 1, fp) != 1) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#4 (text+ko) ==== @@ -28,4 +28,4 @@ $SETFMAC sebsd/system_u:object_r:pbs_exec_t /System/Library/CoreServices/pbs $SETFMAC sebsd/system_u:object_r:windowserver_exec_t /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer* $SETFMAC sebsd/system_u:object_r:securityserver_exec_t /System/Library/CoreServices/SecurityServer -$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd+$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602151836.k1FIanac034356>