← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gdm/hardy-updates

« 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
  • mfrom: (1.4.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20071211153443-ndi1b5u2d6oybb7p
Tags: 2.20.2-1ubuntu1
https://launchpad.net/bugs/151788
https://launchpad.net/bugs/151848
* Sync with Debian
* debian/control.in:
  - Breaks on packages using the previous socket location
  - Depend on kbd | console-tools for fgconsole
  - Depends on alsa-utils for gdmplay
  - Recommends ubuntu-artwork | edubuntu-artwork | xubuntu-default-settings, 
    ubuntu-sounds
  - the package in maintained by the desktop team on Ubuntu
* debian/control.in, debian/gdm.dirs, debian/gdm.install:
  - don't install the Debian theme
* debian/gdm.init:
  - use the Ubuntu init version
* debian/gdm.install:
  - list gdmplay binary
* debian/gdm.templates:
  - Fix template to point to /usr/sbin/gdm not /usr/bin. (LP: 129017)
* debian/gdmplay:
  - small asound wrapper
* debian/patches/01_xconfigoptions.patch:
  - patch configure to use "-br" (Ubuntu: #12985).
* debian/patches/01_xrdb_nocpp.patch:
  - call xrdb with the "nocpp" option (Ubuntu: #14268).
* debian/patches/04_menu_changes.patch:
  - don't display some of the menu items
* debian/patches/06_no_conffile_diff_due_to_comment_change.patch:
  - don't change comments to gdm.conf-custom to not get a conffile change
    on upgrade (Ubuntu: #92302)
* debian/patches/08_notify_ck_about_static_server.patch:
  - "Notify ck about initial static server."
* debian/patches/10_noxkeepcrashing.patch:
  - option NoXKeepsCrashing to disable all XKeepsCrashing code.
* debian/patches/11_powermanagement.patch:
  - add hibernate action
  - fix typo in the hibernate command configuration (LP: #151788)
  - make the hibernate action being listed (LP: #151848)
* debian/patches/15_usplash.patch:
  - Log that we're starting up gdm before stopping usplash. If usplash was
    running, don't bother logging successful startup, as it will look
    weird on the console.
  - If usplash was running, wait a short while for the active console to
    change after starting up gdm, to try to avoid visible console noise
    from later init scripts
* debian/patches/16_configure_menu_item.patch:
  - drop the configure option from gdmsetup, it's not sudo friendly
* debian/patches/18_combo_box_language_selector.patch:
  - use a combo box for the language selector
* debian/patches/19_remove_drop_shadows.patch:
  - removed the black drop shadow from GDM windows, 
* debian/patches/20_timedlogindelay_min_value_change.patch:
  - change minimal TimedLoginDelay to 1 (Ubuntu: #84239)
* debian/patches/35_gdm.conf.patch:
  - SuspendCommand=/usr/sbin/pmi action sleep
  - HibernateCommand=/usr/sbin/pmi action hibernate
  - SoundProgram=/usr/lib/gdmplay
  - GtkTheme=Human
  - ConfigAvailable=false
  - BackgroundColor=#dab08
  - GraphicalThemedColor=#dab082
  - use "Browser=true" so the users lists work correctly (LP: 115952)
  - set SoundOnLoginFile value to question.wav (LP: 131601)
* debian/patches/41_config-files.patch:
  - dropped, don't use Debian configuration file location hack
* debian/patches/56_xnest-wrapper.patch:
  - updated
* debian/patches/63_xrandr_virtual.patch:
  - on randr1.0 drivers, set the virtual to the screen resolution in 
    order to avoid panning setups (part of LP: 137517)
* debian/patches/70_mandatory-relibtoolize.patch:
  - updated
* debian/patches/90_workaround_init_color.patch:
  - set the color to use in the PreSession to workaround a bug
* debian/rules:
  - change custom configuration file naming
  - set the standard configuration location
  - specify the correct at-spi directory

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; "