Module Name:    src
Committed By:   riastradh
Date:           Wed Jul 24 02:06:38 UTC 2013

Modified Files:
        src/sys/external/bsd/drm2/include/drm [riastradh-drm2]: drm_os_netbsd.h
Added Files:
        src/sys/external/bsd/drm2/include/drm [riastradh-drm2]:
            drm_auth_netbsd.h

Log Message:
Implement DRM_SUSER compatibility kludge.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 \
    src/sys/external/bsd/drm2/include/drm/drm_auth_netbsd.h
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
    src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.1.2.5 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.1.2.6
--- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.1.2.5	Wed Jul 24 02:00:44 2013
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h	Wed Jul 24 02:06:38 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_os_netbsd.h,v 1.1.2.5 2013/07/24 02:00:44 riastradh Exp $	*/
+/*	$NetBSD: drm_os_netbsd.h,v 1.1.2.6 2013/07/24 02:06:38 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
 #endif
 
 #include <drm/drm_agp_netbsd.h>
+#include <drm/drm_auth_netbsd.h>
 #include <drm/drm_copy_netbsd.h>
 #include <drm/drm_irq_netbsd.h>
 #include <drm/drm_wait_netbsd.h>

Added files:

Index: src/sys/external/bsd/drm2/include/drm/drm_auth_netbsd.h
diff -u /dev/null src/sys/external/bsd/drm2/include/drm/drm_auth_netbsd.h:1.1.2.1
--- /dev/null	Wed Jul 24 02:06:38 2013
+++ src/sys/external/bsd/drm2/include/drm/drm_auth_netbsd.h	Wed Jul 24 02:06:38 2013
@@ -0,0 +1,44 @@
+/*	$NetBSD: drm_auth_netbsd.h,v 1.1.2.1 2013/07/24 02:06:38 riastradh Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DRM_DRM_AUTH_NETBSD_H_
+#define _DRM_DRM_AUTH_NETBSD_H_
+
+#include <sys/kauth.h>
+
+static inline bool
+DRM_SUSER(void)
+{
+	return kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+	    NULL) == 0;
+}
+
+#endif  /* _DRM_DRM_AUTH_NETBSD_H_ */

Reply via email to