Changeset 39fe8b0


Ignore:
Timestamp:
Jul 11, 2013 9:18:21 AM (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
5cbdc44
Parents:
34fdbb5
Message:

Update PCDM to use pcdm.conf out of /usr/local/etc/

Location:
src-qt4
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDM.pro

    r68de35a r39fe8b0  
    119119 
    120120conf=pcdm.conf 
    121 conf.path=/usr/local/share/PCDM 
    122 conf.extra=cp pcdm.conf /usr/local/share/PCDM/pcdm.conf 
     121conf.path=/usr/local/etc 
     122conf.extra=cp pcdm.conf /usr/local/etc/pcdm.conf.dist && chmod 600 /usr/local/etc/pcdm.conf.dist 
    123123 
    124124INSTALLS += dotrans scripts rcd cleanthemes theme conf target 
  • src-qt4/PCDM/PCDMd

    rb1457e5 r39fe8b0  
    44#------------------------------------ 
    55 
     6PCDMCONF="/usr/local/etc/pcdm.conf" 
     7 
    68#See if XDMCP support is enabled for logging in to this system 
    7 if [ -f /usr/local/share/PCDM/pcdm.conf .and. -z "`grep ALLOW_REMOTE_LOGIN=TRUE /usr/local/share/PCDM/pcdm.conf`" ];  
    8 then 
     9XDMCP=`grep "^ALLOW_REMOTE_LOGIN=" ${PCDMCONF} 2>/dev/null | cut -d '=' -f 2` 
     10if [ "XDMCP" = "TRUE" ]; then 
    911  # XDMCP is enabled 
    1012  echo "Starting PCDM XDMCP Server" 
     
    1315  done 
    1416else 
    15   # No XDMCP support 
     17  # No XDMCP Enabled 
    1618 
    1719  # Allow Auto-Login the first time PCDM starts 
  • src-qt4/PCDM/pcdm.conf

    r1620346 r39fe8b0  
    11##################################### 
    2 SAMPLE PCDM CONFIGURATION FILE   # 
    3 # (/usr/local/share/PCDM/pcdm.conf) # 
     2PCDM CONFIGURATION FILE          # 
     3# (/usr/local/etc/pcdm.conf.dist)  # 
    44##################################### 
    55 
     
    2424 
    2525## ADDITIONAL SETTINGS ## 
    26 ENABLE_VIEW_PASSWORD_BUTTON=TRUE  #enable the option to show the password as text when a button is held 
     26ENABLE_VIEW_PASSWORD_BUTTON=FALSE  #enable the option to show the password as text when a button is held 
    2727 
  • src-qt4/PCDM/src/main.cpp

    rb1457e5 r39fe8b0  
    4141  QString changeLang;  
    4242  // Load the configuration file 
    43   QString confFile = "/usr/local/share/PCDM/pcdm.conf"; 
     43  QString confFile = "/usr/local/etc/pcdm.conf"; 
    4444  if(!QFile::exists(confFile)){ confFile = ":samples/pcdm.conf"; } 
    4545  Config::loadConfigFile(confFile); 
Note: See TracChangeset for help on using the changeset viewer.