diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-17 10:51:44 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-17 10:51:44 -0400 |
commit | bc3865e41423343e45e14bfa0defbb1fe95d742b (patch) | |
tree | 46f9934461002c2938a2af78022a420cf0912aa5 /pkgs/applications/display-managers | |
parent | acdd81fb9c586a110b0986fd3fd4816357102a36 (diff) | |
download | nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.tar nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.tar.gz nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.tar.bz2 nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.tar.lz nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.tar.xz nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.tar.zst nixlib-bc3865e41423343e45e14bfa0defbb1fe95d742b.zip |
slim: Update to 1.3.4
Diffstat (limited to 'pkgs/applications/display-managers')
-rw-r--r-- | pkgs/applications/display-managers/slim/pam.patch | 89 | ||||
-rw-r--r-- | pkgs/applications/display-managers/slim/pam2.patch | 20 |
2 files changed, 0 insertions, 109 deletions
diff --git a/pkgs/applications/display-managers/slim/pam.patch b/pkgs/applications/display-managers/slim/pam.patch deleted file mode 100644 index 2163d20a5e32..000000000000 --- a/pkgs/applications/display-managers/slim/pam.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp -*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200 ---- slim-1.3.1/app.cpp 2009-02-17 19:50:06.000000000 +0100 -*************** -*** 41,48 **** - Panel* panel = *static_cast<Panel**>(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; i<num_msg; i++){ -! resp[i]->resp=0; -! resp[i]->resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username ---- 41,48 ---- - Panel* panel = *static_cast<Panel**>(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; i<num_msg; i++){ -! (*resp)[i].resp=0; -! (*resp)[i].resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username -*************** -*** 51,63 **** - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! resp[i]->resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! resp[i]->resp=strdup(panel->GetName().c_str()); - break; - } - break; ---- 51,63 ---- - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! (*resp)[i].resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! (*resp)[i].resp=strdup(panel->GetName().c_str()); - break; - } - break; -*************** -*** 73,79 **** - - default: - panel->EventHandler(Panel::Get_Passwd); -! resp[i]->resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; ---- 73,79 ---- - - default: - panel->EventHandler(Panel::Get_Passwd); -! (*resp)[i].resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; -*************** -*** 89,97 **** - } - if (result!=PAM_SUCCESS){ - for (int i=0; i<num_msg; i++){ -! if (resp[i]->resp==0) continue; -! free(resp[i]->resp); -! resp[i]->resp=0; - }; - free(*resp); - *resp=0; ---- 89,97 ---- - } - if (result!=PAM_SUCCESS){ - for (int i=0; i<num_msg; i++){ -! if ((*resp)[i].resp==0) continue; -! free((*resp)[i].resp); -! (*resp)[i].resp=0; - }; - free(*resp); - *resp=0; diff --git a/pkgs/applications/display-managers/slim/pam2.patch b/pkgs/applications/display-managers/slim/pam2.patch deleted file mode 100644 index 48cf661864ba..000000000000 --- a/pkgs/applications/display-managers/slim/pam2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp -*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200 ---- slim-1.3.1/app.cpp 2009-08-17 02:59:37.000000000 +0200 -*************** -*** 226,232 **** - pam.start("slim"); - pam.set_item(PAM::Authenticator::TTY, DisplayName); - pam.set_item(PAM::Authenticator::Requestor, "root"); -! pam.set_item(PAM::Authenticator::Host, "localhost"); - - } - catch(PAM::Exception& e){ ---- 226,232 ---- - pam.start("slim"); - pam.set_item(PAM::Authenticator::TTY, DisplayName); - pam.set_item(PAM::Authenticator::Requestor, "root"); -! pam.set_item(PAM::Authenticator::Host, ""); - - } - catch(PAM::Exception& e){ |