rpms/krb5/devel krb5-1.6.1-pam.patch,1.1,1.2

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7774

Modified Files:
	krb5-1.6.1-pam.patch 
Log Message:
- that should work better


krb5-1.6.1-pam.patch:

Index: krb5-1.6.1-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krb5-1.6.1-pam.patch	22 Jun 2007 22:03:14 -0000	1.1
+++ krb5-1.6.1-pam.patch	22 Jun 2007 23:21:07 -0000	1.2
@@ -87,7 +87,7 @@
 +			       KSHELL_PAM_SERVICE,
 +			       0,
 +			       locuser,
-+			       NULL,
++			       "",
 +			       do_encrypt ?
 +			       EKSHELL_PAM_SERVICE :
 +			       KSHELL_PAM_SERVICE) != 0) {
@@ -221,7 +221,7 @@
  
 +#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 @@
  
 +#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 @@
      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 @@
 +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;
 +}