diff --git a/nmb.init b/nmb.init
index 6234ff9..238b5a7 100644
--- a/nmb.init
+++ b/nmb.init
@@ -82,9 +82,10 @@ if [ "$1" = status ]; then
        exit $?
 fi
 
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
+uid=`id | cut -d\( -f1 | cut -d= -f2`
 
+# Check that we stop here for non-root users
+[ $uid -ne 0 ] && exit 4
 
 
 case "$1" in
diff --git a/samba.spec b/samba.spec
index 1f5358e..14b64b4 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,4 +1,4 @@
-%define main_release 65
+%define main_release 66
 %define samba_version 3.6.0
 %define tdb_version 1.2.1
 %define talloc_version 2.0.1
@@ -651,6 +651,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Mon Apr 04 2011 Guenther Deschner <gdeschner@redhat.com> - 3.6.0pre1-66
+- Fix root checks in init scripts
+- resolves: #692594
+
 * Fri Mar 11 2011 Guenther Deschner <gdeschner@redhat.com> - 3.6.0pre1-65
 - Enable quota support
 
diff --git a/smb.init b/smb.init
index f9fec26..80194af 100644
--- a/smb.init
+++ b/smb.init
@@ -82,8 +82,10 @@ if [ "$1" = status ]; then
        exit $?
 fi
 
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
+uid=`id | cut -d\( -f1 | cut -d= -f2`
+
+# Check that we stop here for non-root users
+[ $uid -ne 0 ] && exit 4
 
 
 
diff --git a/winbind.init b/winbind.init
index 88ce028..50a85ba 100644
--- a/winbind.init
+++ b/winbind.init
@@ -72,8 +72,10 @@ if [ "$1" = status ]; then
        exit $?
 fi
 
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
+uid=`id | cut -d\( -f1 | cut -d= -f2`
+
+# Check that we stop here for non-root users
+[ $uid -ne 0 ] && exit 4
 
 case "$1" in
   start)