session: Fix broken session id handling
Also fixes a minor memory leak.
This commit is contained in:
parent
c350cbcf4b
commit
de008aa637
|
@ -355,8 +355,6 @@ ice_init(void)
|
||||||
callbacks.save_complete.client_data =
|
callbacks.save_complete.client_data =
|
||||||
callbacks.shutdown_cancelled.client_data = (SmPointer) NULL;
|
callbacks.shutdown_cancelled.client_data = (SmPointer) NULL;
|
||||||
|
|
||||||
client_id = Estrdup(sm_client_id);
|
|
||||||
|
|
||||||
error_string_ret[0] = '\0';
|
error_string_ret[0] = '\0';
|
||||||
|
|
||||||
sm_conn =
|
sm_conn =
|
||||||
|
@ -364,8 +362,9 @@ ice_init(void)
|
||||||
SmcSaveYourselfProcMask | SmcDieProcMask |
|
SmcSaveYourselfProcMask | SmcDieProcMask |
|
||||||
SmcSaveCompleteProcMask |
|
SmcSaveCompleteProcMask |
|
||||||
SmcShutdownCancelledProcMask, &callbacks,
|
SmcShutdownCancelledProcMask, &callbacks,
|
||||||
client_id, &sm_client_id, 4096, error_string_ret);
|
sm_client_id, &client_id, 4096, error_string_ret);
|
||||||
Efree(client_id);
|
|
||||||
|
EFREE_SET(sm_client_id, client_id);
|
||||||
|
|
||||||
if (error_string_ret[0])
|
if (error_string_ret[0])
|
||||||
Eprintf("While connecting to session manager: %s.", error_string_ret);
|
Eprintf("While connecting to session manager: %s.", error_string_ret);
|
||||||
|
|
Loading…
Reference in New Issue