]>
Commit | Line | Data |
---|---|---|
1792543c JP |
1 | --- src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp.orig 2016-10-24 22:48:30.177292847 +0200 |
2 | +++ src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp 2016-10-24 22:53:43.351327894 +0200 | |
3 | @@ -394,7 +394,11 @@ | |
4 | #endif | |
5 | pszDomain); | |
6 | /* Trigger LightDM authentication with the user name just retrieved. */ | |
7 | +#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2 | |
8 | + lightdm_greeter_authenticate(pCtx->pGreeter, pszUsername, NULL); /* Must be the real user name from host! */ | |
9 | +#else | |
10 | lightdm_greeter_authenticate(pCtx->pGreeter, pszUsername); /* Must be the real user name from host! */ | |
11 | +#endif | |
12 | ||
13 | /* Securely wipe the user name + domain again. */ | |
14 | VbglR3CredentialsDestroy(pszUsername, NULL /* pszPassword */, pszDomain, | |
15 | @@ -448,7 +452,11 @@ | |
16 | { | |
17 | if (pCtx->pszPassword) | |
18 | { | |
19 | +#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2 | |
20 | + lightdm_greeter_respond(pGreeter, pCtx->pszPassword, NULL); | |
21 | +#else | |
22 | lightdm_greeter_respond(pGreeter, pCtx->pszPassword); | |
23 | +#endif | |
24 | } | |
25 | else | |
26 | { | |
27 | @@ -460,7 +468,11 @@ | |
28 | AssertPtr(pEdtPwd); | |
29 | const gchar *pszPwd = gtk_entry_get_text(pEdtPwd); | |
30 | #endif | |
31 | +#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2 | |
32 | + lightdm_greeter_respond(pGreeter, pszPwd, NULL); | |
33 | +#else | |
34 | lightdm_greeter_respond(pGreeter, pszPwd); | |
35 | +#endif | |
36 | } | |
37 | break; | |
38 | } | |
39 | @@ -587,8 +599,13 @@ | |
40 | #endif | |
41 | if (strlen(pszUser)) /* Only authenticate if username is given. */ | |
42 | { | |
43 | +#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2 | |
44 | + lightdm_greeter_respond(pCtx->pGreeter, pszPwd, NULL); | |
45 | + lightdm_greeter_authenticate(pCtx->pGreeter, pszUser, NULL); | |
46 | +#else | |
47 | lightdm_greeter_respond(pCtx->pGreeter, pszPwd); | |
48 | lightdm_greeter_authenticate(pCtx->pGreeter, pszUser); | |
49 | +#endif | |
50 | } | |
51 | } | |
52 | ||
53 | --- src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk.orig 2016-10-24 23:14:30.007548938 +0200 | |
54 | +++ src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk 2016-10-24 23:16:23.902737037 +0200 | |
55 | @@ -48,7 +48,7 @@ | |
56 | GTK_DISABLE_SINGLE_INCLUDES \ | |
57 | GDK_DISABLE_DEPRECATED | |
58 | endif | |
59 | -vbox-greeter_CFLAGS := $(if $(VBOX_OSE),$(filter-out -I%,$(shell pkg-config --cflags liblightdm-gobject-1)),) | |
60 | +vbox-greeter_CXXFLAGS := $(if $(VBOX_OSE),$(filter-out -I%,$(shell pkg-config --cflags liblightdm-gobject-1)),) $(if $(shell pkg-config --exists 'liblightdm-gobject-1 >= 1.19.2' && echo 1),-DHAVE_LIBLIGHTDMGOBJECT_1_19_2,) | |
61 | ## @todo r=bird: Why are we cooking our own lightdm-gobject-1 but using system headers? | |
62 | ## That sounds like a very risky business to me. I've added liblightdm-gobject-1.5.0 | |
63 | ## to the INCS, however lightdm.h is missing and will be taken from the system. |