[uim-commit] r1657 - trunk/scm

[tkng at freedesktop.org]

Author: tkng
Date: 2005-09-28 06:20:28 -0700 (Wed, 28 Sep 2005)
New Revision: 1657

Modified:
   trunk/scm/custom-rt.scm
Log:
* scm/custom-rt.scm:
  -(require-custom): Don't load user configration file if worked under 
    setuid/setgid application.
 -(custom-reload-user-configs): Ditto.


Modified: trunk/scm/custom-rt.scm
===================================================================
--- trunk/scm/custom-rt.scm	2005-09-28 13:00:38 UTC (rev 1656)
+++ trunk/scm/custom-rt.scm	2005-09-28 13:20:28 UTC (rev 1657)
@@ -111,7 +111,8 @@
 		(cons filename custom-required-custom-files)))
       (let* ((post-groups (custom-list-primary-groups))
 	     (new-groups (list-tail post-groups (length pre-groups))))
-	(if (not (getenv "LIBUIM_VANILLA"))
+	(if (and (not (getenv "LIBUIM_VANILLA"))
+		 (not (is-set-ugid?)))
 	    (for-each (lambda (gsym)
 			(custom-load-group-conf gsym)
 			(custom-update-group-conf-freshness gsym))
@@ -265,6 +266,7 @@
 (define custom-reload-user-configs
   (lambda ()
     (and (not (getenv "LIBUIM_VANILLA"))
+	 (not (is-set-ugid?))
 	 (let ((load-conf (if custom-enable-mtime-aware-user-conf-reloading?
 			      custom-load-updated-group-conf
 			      custom-load-group-conf)))  ;; original behavior