Changeset e7f50cc


Ignore:
Timestamp:
12/05/13 09:43:37 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
4f9718b, 549d441
Parents:
765d4e3 (diff), 90b5e991 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/main.cpp

    ra982a19 r8877013  
    6161  // Startup the main application 
    6262  QApplication a(argc,argv);  
    63    
     63  int retCode = 0; //used for UI/application return 
    6464  // Show our splash screen, so the user doesn't freak that that it takes a few seconds to show up 
    6565  QSplashScreen splash; 
     
    141141    //qDebug() << "Showing GUI:" << QString::number(clock.elapsed())+" ms"; 
    142142    w.show(); 
    143     a.exec(); 
     143    retCode = a.exec(); 
    144144  }  // end of PCDM GUI running 
    145   int retcode = 0; 
    146145  //Wait for the desktop session to finish before exiting 
    147146  //if(USECLIBS){ desktop.startDesktop(); } 
     
    156155  } 
    157156  //check for shutdown process 
    158   if(QFile::exists("/var/run/nologin")){ 
     157  if(QFile::exists("/var/run/nologin") || retCode > 0){ 
    159158    splash.showMessage(QObject::tr("System Shutting Down"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white); 
    160159    QCoreApplication::processEvents(); 
     
    166165    } 
    167166    //set the return code for a shutdown 
    168     retcode = -1; //make sure it does not start a new session 
     167    retCode = -1; //make sure it does not start a new session 
    169168  } 
    170169   
     
    175174   
    176175   
    177   return retcode; 
     176  return retCode; 
    178177} 
    179178 
  • src-qt4/PCDM/src/pcdm-gui.cpp

    rdaab719 r8877013  
    352352    Backend::log("PCDM: Shutting down computer"); 
    353353    system("shutdown -p now"); 
    354     close(); 
     354    QCoreApplication::exit(1); //flag that this is not a normal GUI close 
    355355  } 
    356356} 
     
    368368    Backend::log("PCDM: Restarting computer"); 
    369369    system("shutdown -r now"); 
    370     close(); 
     370    QCoreApplication::exit(1); //flag that this is not a normal GUI close 
    371371  } 
    372372} 
  • src-sh/pc-adctl/scripts/pc-nssldap

    r1620346 r765d4e3  
    110110        local usersuffix=$(ldap_get usersuffix) 
    111111        local groupsuffix=$(ldap_get groupsuffix) 
    112         local passwordsuffix=$(ldap_get passwordsuffix) 
     112        local passwordsuffix=$(ldap_get passwordstuff) 
    113113        local machinesuffix=$(ldap_get machinesuffix) 
    114114        local encryption_mode=$(ldap_get encryption_mode) 
     
    124124        tmp=$(mktemp /tmp/tmp.XXXXXX) 
    125125        ${cmd} \ 
    126                 -c -m "^host=${hostname}" \ 
     126                -c -m "^host=${host}" \ 
    127127                -c -m "^base=${basedn}" \ 
    128128                -c -m "^rootbinddn=${rootbasedn}" \ 
     
    265265                ln -sf ${secret} "$(dirname ${secret})/ldap.secret" 
    266266        fi 
     267 
     268        # Set the shadow options 
     269        cmd="${NSSLDAPCONF} -f ${conf}" 
     270 
     271        tmp=$(mktemp /tmp/tmp.XXXXXX) 
     272 
     273        if [ -z "${passwordsuffix}" ] 
     274        then 
     275                ${cmd} -c -m "^nss_base_shadow=${basedn}" -o "${tmp}" 
     276        else 
     277                ${cmd} -c -m "^nss_base_shadow=${passwordsuffix},${basedn}" -o "${tmp}" 
     278        fi 
     279        if [ "$?" != "0" ] 
     280        then 
     281                return 1 
     282        fi 
     283        if ! safe_save "${tmp}" "${conf}" 
     284        then 
     285                return 1 
     286        fi 
     287 
    267288} 
    268289 
  • src-sh/pc-adctl/scripts/pc-pam

    r1620346 r765d4e3  
    884884        elif checkyesno pc_ldap_enable 2>/dev/null 
    885885        then 
    886                 auth='-auth:sufficient:${pam_ldap}' 
    887                 account='-account:sufficient:${pam_ldap}' 
    888                 session='-session:required:${pam_mkhomedir}' 
    889                 password='-password:sufficient:${pam_ldap}' 
     886                auth="-auth:sufficient:${pam_ldap}" 
     887                account="-account:sufficient:${pam_ldap}" 
     888                session="-session:required:${pam_mkhomedir}" 
     889                password="-password:sufficient:${pam_ldap}" 
    890890 
    891891                do_pam_conf "${auth}" "${account}" "${session}" "${password}" 
Note: See TracChangeset for help on using the changeset viewer.