- that should work better

This commit is contained in:
Nalin Dahyabhai 2007-06-22 23:21:07 +00:00
parent e773dcc288
commit 8f7d649fe0

View File

@ -87,7 +87,7 @@ When enabled, ftpd, krshd, and login.krb5 gain dependence on libpam.
+ KSHELL_PAM_SERVICE,
+ 0,
+ locuser,
+ NULL,
+ "",
+ do_encrypt ?
+ EKSHELL_PAM_SERVICE :
+ KSHELL_PAM_SERVICE) != 0) {
@ -221,7 +221,7 @@ When enabled, ftpd, krshd, and login.krb5 gain dependence on libpam.
+#ifdef USE_PAM
+ if (login_use_pam) {
+ if (appl_pam_authenticate(LOGIN_PAM_SERVICE, 1, username, NULL,
+ if (appl_pam_authenticate(LOGIN_PAM_SERVICE, 1, username, "",
+ ttyname(STDIN_FILENO)) == PAM_SUCCESS) {
+ break;
+ } else {
@ -240,7 +240,7 @@ When enabled, ftpd, krshd, and login.krb5 gain dependence on libpam.
+#ifdef USE_PAM
+ if (login_use_pam) {
+ if (appl_pam_acct_mgmt(LOGIN_PAM_SERVICE, 0, username, NULL,
+ if (appl_pam_acct_mgmt(LOGIN_PAM_SERVICE, 0, username, "",
+ ttyname(STDIN_FILENO)) != 0) {
+ printf("Login incorrect\n");
+ sleepexit(1);
@ -295,7 +295,7 @@ When enabled, ftpd, krshd, and login.krb5 gain dependence on libpam.
if (pwd->pw_uid == 0)
--- /dev/null 2007-06-22 10:29:46.741860805 -0400
+++ krb5-1.6.1/src/appl/bsd/pam.c 2007-06-22 14:22:10.000000000 -0400
@@ -0,0 +1,408 @@
@@ -0,0 +1,412 @@
+/*
+ * src/appl/bsd/pam.c
+ *
@ -362,10 +362,14 @@ When enabled, ftpd, krshd, and login.krb5 gain dependence on libpam.
+appl_pam_enabled(krb5_context context, const char *section)
+{
+ int enabled = 1;
+ if (profile_get_boolean(context->profile,
+ section, USE_PAM_CONFIGURATION_KEYWORD, NULL,
+ enabled, &enabled) != 0) {
+ enabled = 1;
+ if ((context != NULL) && (context->profile != NULL)) {
+ if (profile_get_boolean(context->profile,
+ section,
+ USE_PAM_CONFIGURATION_KEYWORD,
+ NULL,
+ enabled, &enabled) != 0) {
+ enabled = 1;
+ }
+ }
+ return enabled;
+}