author | yippi |
Mon, 27 Sep 2010 21:07:51 +0000 | |
changeset 20108 | 51df67ca9307 |
parent 18188 | d9313857cc59 |
permissions | -rw-r--r-- |
18188
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
1 |
/* |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
2 |
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
3 |
* |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
4 |
* Permission is hereby granted, free of charge, to any person obtaining a |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
5 |
* copy of this software and associated documentation files (the "Software"), |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
6 |
* to deal in the Software without restriction, including without limitation |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
7 |
* the rights to use, copy, modify, merge, publish, distribute, sublicense, |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
8 |
* and/or sell copies of the Software, and to permit persons to whom the |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
9 |
* Software is furnished to do so, subject to the following conditions: |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
10 |
* |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
11 |
* The above copyright notice and this permission notice (including the next |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
12 |
* paragraph) shall be included in all copies or substantial portions of the |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
13 |
* Software. |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
14 |
* |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
15 |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
16 |
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
17 |
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
18 |
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
19 |
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
20 |
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
21 |
* DEALINGS IN THE SOFTWARE. |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
22 |
*/ |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
23 |
|
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
24 |
|
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
25 |
driver/lock.c | 2 +- |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
26 |
1 files changed, 1 insertions(+), 1 deletions(-) |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
27 |
|
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
28 |
diff --git xscreensaver-5.11/driver/lock.c xscreensaver-5.11/driver/lock.c |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
29 |
--- xscreensaver-5.11/driver/lock.c |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
30 |
+++ xscreensaver-5.11/driver/lock.c |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
31 |
@@ -3013,7 +3013,7 @@ auth_finished_cb (saver_info *si) |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
32 |
} |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
33 |
|
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
34 |
END: |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
35 |
- if (si->pw_data) |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
36 |
+ if (si->pw_data && si->pw_data->prompt_screen) |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
37 |
destroy_passwd_window (si); |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
38 |
} |
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
39 |
|
d9313857cc59
CR 6964562 xscreensaver dumps core whenever it unlocks in snv-142s
akumrao
parents:
diff
changeset
|
40 |