PERFORCE change 95909 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=95909

Change 95909 by jb at jb_freebsd2 on 2006/04/22 23:48:04

	Subtle difference in credential field names for saved uid and gid.
	
	FreeBSD doesn't have zones.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#4 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#4 (text+ko) ====

@@ -33,6 +33,8 @@
 #define delay(_a)		DELAY(_a)
 #define vuprintf		vprintf
 #define CRED()			curthread->td_ucred
+#define	cr_suid			cr_svuid
+#define	cr_sgid			cr_svgid
 #define	P2ROUNDUP(x, align)	(-(-(x) & -(align)))
 #define	IS_P2ALIGNED(v, a)	((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0)
 #define	TQ_SLEEP	0x00	/* Can block for memory */

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#2 (text+ko) ====

@@ -35,6 +35,7 @@
 static int
 dtrace_priv_proc_common_zone(dtrace_state_t *state)
 {
+#if defined(sun)
 	cred_t *cr, *s_cr = state->dts_cred.dcr_cred;
 
 	/*
@@ -48,6 +49,9 @@
 		return (1);
 
 	return (0);
+#else
+	return (1);
+#endif
 }
 
 /*
@@ -57,11 +61,13 @@
 static int
 dtrace_priv_proc_common_nocd()
 {
+#if defined(sun)
 	proc_t *proc;
 
 	if ((proc = ttoproc(curthread)) != NULL &&
 	    !(proc->p_flag & SNOCD))
 		return (1);
+#endif
 
 	return (0);
 }