|
Lines 116-121
Link Here
|
| 116 |
{ |
116 |
{ |
| 117 |
double start_time; |
117 |
double start_time; |
| 118 |
char x_cmd[PATH_MAX]; |
118 |
char x_cmd[PATH_MAX]; |
|
|
119 |
char *x_opts; |
| 119 |
|
120 |
|
| 120 |
/* Ecore_Exe *x_exe; */ |
121 |
/* Ecore_Exe *x_exe; */ |
| 121 |
pid_t xpid; |
122 |
pid_t xpid; |
|
Lines 125-131
Link Here
|
| 125 |
x_ready = 0; |
126 |
x_ready = 0; |
| 126 |
|
127 |
|
| 127 |
/* Create server auth cookie */ |
128 |
/* Create server auth cookie */ |
| 128 |
|
129 |
x_opts = e_db_str_get(db, "/entrance/server-opts"); |
|
|
130 |
if (!x_opts) |
| 131 |
x_opts = strdup("-nolisten tcp"); |
| 129 |
if(d->auth_en) |
132 |
if(d->auth_en) |
| 130 |
{ |
133 |
{ |
| 131 |
if (!entranced_auth_display_secure(d)) |
134 |
if (!entranced_auth_display_secure(d)) |
|
Lines 134-144
Link Here
|
| 134 |
return -1; |
137 |
return -1; |
| 135 |
} |
138 |
} |
| 136 |
|
139 |
|
| 137 |
snprintf(x_cmd, PATH_MAX, "%s -auth %s %s", X_SERVER, d->authfile, d->name); |
140 |
snprintf(x_cmd, PATH_MAX, "%s %s -auth %s %s", X_SERVER, x_opts, d->authfile, d->name); |
| 138 |
} |
141 |
} |
| 139 |
else |
142 |
else |
| 140 |
{ |
143 |
{ |
| 141 |
snprintf(x_cmd, PATH_MAX, "%s %s", X_SERVER, d->name); |
144 |
snprintf(x_cmd, PATH_MAX, "%s %s %s", X_SERVER, x_opts, d->name); |
| 142 |
} |
145 |
} |
| 143 |
entranced_debug("Entranced_Start_Server_Once: Executing %s\n", x_cmd); |
146 |
entranced_debug("Entranced_Start_Server_Once: Executing %s\n", x_cmd); |
| 144 |
|
147 |
|
