-/* xscreensaver, Copyright (c) 1998, 2001 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1998-2008 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include "resources.h"
#include "version.h"
#include "visual.h"
+#include "auth.h"
char *progname = 0;
char *progclass = 0;
int move_mouse_grab (saver_info *si, Window to, Cursor c, int ts) { return 0; }
int mouse_screen (saver_info *si) { return 0; }
void check_for_leaks (const char *where) { }
-void exec_command (const char *shell, const char *command, int nice) { }
void shutdown_stderr (saver_info *si) { }
const char *blurb(void) { return progname; }
Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
-void
-get_screen_viewport (saver_screen_info *ssi,
- int *x_ret, int *y_ret,
- int *w_ret, int *h_ret,
- int tx, int ty,
- Bool verbose_p)
-{
- *x_ret = 0;
- *y_ret = 0;
- *w_ret = WidthOfScreen (ssi->screen);
- *h_ret = HeightOfScreen (ssi->screen);
-}
-
-
void
idle_timer (XtPointer closure, XtIntervalId *id)
{
}
+static int
+text_auth_conv (
+ int num_msg,
+ const struct auth_message *auth_msgs,
+ struct auth_response **resp,
+ saver_info *si)
+{
+ char *input;
+ char buf[255];
+ struct auth_response *responses;
+ int i;
+
+ responses = calloc(num_msg, sizeof(struct auth_response));
+ if (!responses)
+ return -1;
+
+ /* The unlock state won't actually be used until this function returns and
+ * the auth module processes the response, but set it anyway for consistency
+ */
+ si->unlock_state = ul_read;
+
+ for (i = 0; i < num_msg; ++i)
+ {
+ printf ("\n%s: %s", progname, auth_msgs[i].msg);
+ if ( auth_msgs[i].type == AUTH_MSGTYPE_PROMPT_NOECHO
+ || auth_msgs[i].type == AUTH_MSGTYPE_PROMPT_ECHO)
+ {
+ input = fgets (buf, sizeof(buf)-1, stdin);
+ if (!input || !*input)
+ exit (0);
+ if (input[strlen(input)-1] == '\n')
+ input[strlen(input)-1] = 0;
+
+ responses[i].response = strdup(input);
+ }
+ }
+
+ *resp = responses;
+
+ si->unlock_state = ul_finished;
+
+ return 0;
+}
+
+
+#ifdef __GNUC__
+ __extension__ /* shut up about "string length is greater than the length
+ ISO C89 compilers are required to support" when including
+ the .ad file... */
+#endif
+
static char *fallback[] = {
#include "XScreenSaver_ad.h"
0
saver_info sip;
saver_info *si = &sip;
saver_preferences *p = &si->prefs;
+ struct passwd *pw;
memset(&sip, 0, sizeof(sip));
memset(&ssip, 0, sizeof(ssip));
exit (1);
}
+#ifdef NO_LOCKING
+ if (which == PASS || which == TTY)
+ {
+ fprintf (stderr, "%s: compiled with NO_LOCKING\n", progname);
+ exit (1);
+ }
+#endif
+
+#ifndef NO_LOCKING
/* before hack_uid() for proper permissions */
lock_priv_init (argc, argv, True);
hack_uid (si);
- if (! lock_init (argc, argv, si->prefs.verbose_p))
+ if (! lock_init (argc, argv, True))
{
si->locking_disabled_p = True;
si->nolock_reason = "error getting password";
}
+#endif
progclass = "XScreenSaver";
visual_depth(si->default_screen->screen,
si->default_screen->current_visual);
+ ssip.width = WidthOfScreen(ssip.screen);
+ ssip.height = HeightOfScreen(ssip.screen);
+
db = p->db;
XtGetApplicationNameAndClass (si->dpy, &progname, &progclass);
- load_init_file (&si->prefs);
-
+ load_init_file (si->dpy, &si->prefs);
}
p->verbose_p = True;
+ pw = getpwuid (getuid ());
+ si->user = strdup (pw->pw_name);
+
+/* si->nscreens = 0;
+ si->screens = si->default_screen = 0; */
+
while (1)
{
+#ifndef NO_LOCKING
if (which == PASS)
{
- if (unlock_p (si))
- fprintf (stderr, "%s: password correct\n", progname);
+ si->unlock_cb = gui_auth_conv;
+ si->auth_finished_cb = auth_finished_cb;
+
+ xss_authenticate(si, True);
+
+ if (si->unlock_state == ul_success)
+ fprintf (stderr, "%s: authentication succeeded\n", progname);
else
- fprintf (stderr, "%s: password INCORRECT!\n", progname);
+ fprintf (stderr, "%s: authentication FAILED!\n", progname);
XSync(si->dpy, False);
+ fprintf (stderr, "\n######################################\n\n");
sleep (3);
}
- else if (which == SPLASH)
+ else
+#endif
+ if (which == SPLASH)
{
XEvent event;
make_splash_dialog (si);
XSync (si->dpy, False);
sleep (1);
}
+#ifndef NO_LOCKING
else if (which == TTY)
{
- char *pass;
- char buf[255];
- struct passwd *p = getpwuid (getuid ());
- printf ("\n%s: %s's password: ", progname, p->pw_name);
+ si->unlock_cb = text_auth_conv;
- pass = fgets (buf, sizeof(buf)-1, stdin);
- if (!pass || !*pass)
- exit (0);
- if (pass[strlen(pass)-1] == '\n')
- pass[strlen(pass)-1] = 0;
+ printf ("%s: Authenticating user %s\n", progname, si->user);
+ xss_authenticate(si, True);
- if (passwd_valid_p (pass, True))
+ if (si->unlock_state == ul_success)
printf ("%s: Ok!\n", progname);
else
printf ("%s: Wrong!\n", progname);
}
+#endif
else
abort();
}
+
+ free(si->user);
}