← Back to branch summary

~darkxst/ubuntu/saucy/gdm/lp1212408

« back to all changes in this revision

Viewing changes to daemon/verify-crypt.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-crypt.c
178
178
 
179
179
        if (pwent == NULL) {
180
180
                gdm_sleep_no_signal (gdm_daemon_config_get_value_int (GDM_KEY_RETRY_DELAY));
181
 
                g_warning (_("Couldn't authenticate user \"%s\""), login);
 
181
                g_warning ("Couldn't authenticate user");
182
182
 
183
183
                print_cant_auth_errbox ();
184
184
 
192
192
        if (ppasswd == NULL || (ppasswd[0] != '\0' &&
193
193
                                strcmp (crypt (passwd, ppasswd), ppasswd) != 0)) {
194
194
                gdm_sleep_no_signal (gdm_daemon_config_get_value_int (GDM_KEY_RETRY_DELAY));
195
 
                g_warning (_("Couldn't authenticate user \"%s\""), login);
 
195
                g_warning ("Couldn't authenticate user");
196
196
 
197
197
                print_cant_auth_errbox ();
198
198
 
206
206
            ( ! gdm_daemon_config_get_value_bool (GDM_KEY_ALLOW_REMOTE_ROOT) &&
207
207
              ! d->attached)) && pwent->pw_uid == 0) {
208
208
 
209
 
                g_warning (_("Root login disallowed on display '%s'"), d->name);
 
209
                g_warning ("Root login disallowed on display '%s'", d->name);
210
210
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
211
211
                                              _("The system administrator "
212
212
                                                "is not allowed to login "
224
224
        /* Check with the 'loginrestrictions' function
225
225
           if the user has been disallowed */
226
226
        if (loginrestrictions (login, 0, NULL, &message) != 0) {
227
 
                g_warning (_("User %s not allowed to log in"), login);
 
227
                g_warning ("User not allowed to log in");
228
228
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
229
229
                                              _("\nThe system administrator "
230
230
                                                "has disabled your "
248
248
            (strcmp (pwent->pw_shell, NOLOGIN) == 0 ||
249
249
             strcmp (pwent->pw_shell, "/bin/true") == 0 ||
250
250
             strcmp (pwent->pw_shell, "/bin/false") == 0)) {
251
 
                g_warning (_("User %s not allowed to log in"), login);
 
251
                g_warning ("User not allowed to log in");
252
252
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
253
253
                                              _("\nThe system administrator "
254
254
                                                "has disabled your "
273
273
        }
274
274
 
275
275
        if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
276
 
                g_warning (_("Cannot set user group for %s"), login);
 
276
                g_warning ("Cannot set user group");
277
277
                gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
278
278
                                              _("\nCannot set your user group; "
279
279
                                                "you will not be able to log in. "
286
286
 
287
287
        switch (passwdexpired (login, &info_msg)) {
288
288
        case 1 :
289
 
                g_warning (_("Password of %s has expired"), login);
 
289
                g_warning ("User password has expired");
290
290
                gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
291
291
                                        _("You are required to change your password.\n"
292
292
                                          "Please choose a new one."));
359
359
                break;
360
360
 
361
361
        case 2 :
362
 
                g_warning (_("Password of %s has expired"), login);
 
362
                g_warning ("User password has expired");
363
363
                gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
364
364
                                        _("Your password has expired.\n"
365
365
                                          "Only a system administrator can now change it"));
368
368
                break;
369
369
 
370
370
        case -1 :
371
 
                g_warning (_("Internal error on passwdexpired"));
 
371
                g_warning ("Internal error on passwdexpired");
372
372
                gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
373
373
                                        _("An internal error occurred. You will not be able to log in.\n"
374
374
                                          "Please try again later or contact your system administrator."));
405
405
 
406
406
        pwent = getpwnam (login);
407
407
        if (pwent == NULL) {
408
 
                g_warning (_("Cannot get passwd structure for %s"), login);
 
408
                g_warning ("Cannot get passwd structure");
409
409
                return FALSE;
410
410
        }
411
411
 
412
412
        if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
413
 
                g_warning (_("Cannot set user group for %s"), login);
 
413
                g_warning ("Cannot set user group");
414
414
                gdm_errorgui_error_box (d,
415
415
                                        GTK_MESSAGE_ERROR,
416
416
                                        _("\nCannot set your user group; "