[Xquartz-changes] [655] trunk/pkg/scripts/postinst_sl.sh

[source_changes at macosforge.org]

Revision: 655
          http://trac.macosforge.org/projects/xquartz/changeset/655
Author:   jeremyhu at freedesktop.org
Date:     2012-08-30 23:03:52 -0700 (Thu, 30 Aug 2012)
Log Message:
-----------
Don't add XAuthLocation to sshd_config if there's a Match block it would fall into.  We should figure out a better way to handle that case.

Modified Paths:
--------------
    trunk/pkg/scripts/postinst_sl.sh

Modified: trunk/pkg/scripts/postinst_sl.sh
===================================================================
--- trunk/pkg/scripts/postinst_sl.sh	2012-08-29 06:05:58 UTC (rev 654)
+++ trunk/pkg/scripts/postinst_sl.sh	2012-08-31 06:03:52 UTC (rev 655)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if ! cat /etc/sshd_config | grep -v '^#' | grep -q XAuthLocation ; then
+if ! cat /etc/sshd_config | grep -v '^#' | egrep -q '^(Match|XAuthLocation)' ; then
     {
         echo ""
         echo "# XAuthLocation added by XQuartz (http://xquartz.macosforge.org)"
@@ -8,7 +8,7 @@
     } >> /etc/sshd_config
 fi
 
-if ! cat /etc/ssh_config | grep -v '^#' | grep -q XAuthLocation ; then
+if ! cat /etc/ssh_config | grep -v '^#' | grep -q 'XAuthLocation' ; then
     {
         echo ""
         echo "# XAuthLocation added by XQuartz (http://xquartz.macosforge.org)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20120830/61ad5a05/attachment.html>