← Back to branch summary

~darkxst/ubuntu/saucy/gdm/lp1212408

« back to all changes in this revision

Viewing changes to daemon/verify-shadow.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-12-11 15:34:43 UTC
  • mto: (2.1.2 lenny) (1.4.50)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: james.westby@ubuntu.com-20071211153443-w5922mvs37kx0g4q
Tags: upstream-2.20.2
Import upstream version 2.20.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/verify-shadow.c
199
199
 
200
200
        if (pwent == NULL) {
201
201
                gdm_sleep_no_signal (gdm_daemon_config_get_value_int (GDM_KEY_RETRY_DELAY));
202
 
                g_warning (_("Couldn't authenticate user \"%s\""), login);
 
202
                g_warning ("Couldn't authenticate user");
203
203
 
204
204
                print_cant_auth_errbox ();
205
205
 
213
213
        if (ppasswd == NULL || (ppasswd[0] != '\0' &&
214
214
                                strcmp (crypt (passwd, ppasswd), ppasswd) != 0)) {
215
215
                gdm_sleep_no_signal (gdm_daemon_config_get_value_int (GDM_KEY_RETRY_DELAY));
216
 
                g_warning (_("Couldn't authenticate user \"%s\""), login);
 
216
                g_warning ("Couldn't authenticate user");
217
217
 
218
218
                print_cant_auth_errbox ();
219
219
 
227
227
            ( ! gdm_daemon_config_get_value_bool (GDM_KEY_ALLOW_REMOTE_ROOT) &&
228
228
              ! d->attached)) && pwent->pw_uid == 0) {
229
229
 
230
 
                g_warning (_("Root login disallowed on display '%s'"), d->name);
 
230
                g_warning ("Root login disallowed on display '%s'", d->name);
231
231
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
232
232
                                              _("The system administrator "
233
233
                                                "is not allowed to login "
245
245
        /* Check with the 'loginrestrictions' function
246
246
           if the user has been disallowed */
247
247
        if (loginrestrictions (login, 0, NULL, &message) != 0) {
248
 
                g_warning (_("User %s not allowed to log in"), login);
 
248
                g_warning ("User not allowed to log in");
249
249
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
250
250
                                              _("\nThe system administrator "
251
251
                                                "has disabled your "
269
269
            (strcmp (pwent->pw_shell, NOLOGIN) == 0 ||
270
270
             strcmp (pwent->pw_shell, "/bin/true") == 0 ||
271
271
             strcmp (pwent->pw_shell, "/bin/false") == 0)) {
272
 
                g_warning (_("User %s not allowed to log in"), login);
 
272
                g_warning ("User not allowed to log in");
273
273
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
274
274
                                              _("\nThe system administrator "
275
275
                                                "has disabled your "
294
294
        }
295
295
 
296
296
        if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
297
 
                g_warning (_("Cannot set user group for %s"), login);
 
297
                g_warning ("Cannot set user group");
298
298
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
299
299
                                              _("\nCannot set your user group; "
300
300
                                                "you will not be able to log in. "
307
307
 
308
308
        switch (passwdexpired (login, &info_msg)) {
309
309
        case 1 :
310
 
                g_warning (_("Password of %s has expired"), login);
 
310
                g_warning ("User password has expired");
311
311
                gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
312
312
                                        _("You are required to change your password.\n"
313
313
                                          "Please choose a new one."));
381
381
                break;
382
382
 
383
383
        case 2 :
384
 
                g_warning (_("Password of %s has expired"), login);
 
384
                g_warning ("User password has expired");
385
385
                gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
386
386
                                        _("Your password has expired.\n"
387
387
                                          "Only a system administrator can now change it"));
390
390
                break;
391
391
 
392
392
        case -1 :
393
 
                g_warning (_("Internal error on passwdexpired"));
 
393
                g_warning ("Internal error on passwdexpired");
394
394
                gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
395
395
                                        _("An internal error occurred. You will not be able to log in.\n"
396
396
                                          "Please try again later or contact your system administrator."));
427
427
 
428
428
        pwent = getpwnam (login);
429
429
        if (pwent == NULL) {
430
 
                g_warning (_("Cannot get passwd structure for %s"), login);
 
430
                g_warning ("Cannot get passwd structure for user");
431
431
                return FALSE;
432
432
        }
433
433
 
434
434
        if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
435
 
                g_warning (_("Cannot set user group for %s"), login);
 
435
                g_warning ("Cannot set user group");
436
436
                gdm_errorgui_error_box (d,
437
437
                                        GTK_MESSAGE_ERROR,
438
438
                                        _("\nCannot set your user group; "