Changeset 8757925


Ignore:
Timestamp:
10/17/14 12:18:09 (9 days ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.1
Children:
d74e56b
Parents:
c41b42a
Message:

Fix an issue with running pc-softweb locally and setting an invalid
dispatcher ID. Fixes issues with creating / deleting jails and such
from a local machine

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softweb/MainUI.cpp

    r7cf5337 r8757925  
    162162    QString authkey = pcbsd::Utils::runShellCommand("pc-su /usr/local/share/appcafe/dispatcher-localauth").join("").simplified(); 
    163163    AUTHCOMPLETE = !authkey.isEmpty(); 
     164    if ( authkey.indexOf(":") != -1 ) 
     165      authkey = authkey.section(":", 1, 1); 
    164166    if(AUTHCOMPLETE){ tmpURL.append("/?setDisId="+authkey); } 
    165167  } 
  • src-webui/appweb/share/html/pages/jailcreate.php

    re28a471 r8757925  
    2828 
    2929  if ( ! $badData ) { 
    30      run_cmd("warden create $jailname --ipv4=$jailipv4"); 
     30     $output = run_cmd("warden create $jailname --ipv4=$jailipv4"); 
    3131     $showForm = false; 
    3232?> 
Note: See TracChangeset for help on using the changeset viewer.