rpms/sssd/F-11 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch, 1.1, 1.2 sssd.spec, 1.16, 1.17

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12695

Modified Files:
	0001-reuse-authtok-which-is-already-in-the-pam-stack.patch 
	sssd.spec 
Log Message:
* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-3
- Add use_first_pass option to fix pam stack problems


0001-reuse-authtok-which-is-already-in-the-pam-stack.patch:

Index: 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/0001-reuse-authtok-which-is-already-in-the-pam-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch	29 Apr 2009 22:02:13 -0000	1.1
+++ 0001-reuse-authtok-which-is-already-in-the-pam-stack.patch	29 Apr 2009 22:05:00 -0000	1.2
@@ -1,17 +1,17 @@
->From 98bb277b9271e5e9175180685d647909b89c06aa Mon Sep 17 00:00:00 2001
+>From 1560c380c7180a21c69f0828bd9439c2044282d9 Mon Sep 17 00:00:00 2001
 From: Sumit Bose <sbose at redhat.com>
 Date: Wed, 29 Apr 2009 21:11:05 +0200
 Subject: [PATCH] reuse authtok which is already in the pam stack
 
 ---
- sss_client/pam_sss.c |   20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
+ sss_client/pam_sss.c |   24 ++++++++++++++++++++++--
+ 1 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/sss_client/pam_sss.c b/sss_client/pam_sss.c
-index d03407c..f2fdefe 100644
+index d03407c..b7588ca 100644
 --- a/sss_client/pam_sss.c
 +++ b/sss_client/pam_sss.c
-@@ -149,8 +149,10 @@ static void print_pam_items(struct pam_items pi)
+@@ -149,8 +149,14 @@ static void print_pam_items(struct pam_items pi)
      D(("Tty: %s", *pi.pam_tty!='\0' ? pi.pam_tty : "(not available)"));
      D(("Ruser: %s", *pi.pam_ruser!='\0' ? pi.pam_ruser : "(not available)"));
      D(("Rhost: %s", *pi.pam_rhost!='\0' ? pi.pam_rhost : "(not available)"));
@@ -19,12 +19,16 @@ index d03407c..f2fdefe 100644
 -    D(("Oldauthtok: %s", *pi.pamstack_oldauthtok!='\0' ? pi.pamstack_oldauthtok : "(not available)"));
 +    D(("Pamstack_Authtok: %s", *pi.pamstack_authtok!='\0' ? pi.pamstack_authtok : "(not available)"));
 +    D(("Pamstack_Oldauthtok: %s", *pi.pamstack_oldauthtok!='\0' ? pi.pamstack_oldauthtok : "(not available)"));
-+    D(("Authtok: %s", *pi.pam_authtok!='\0' ? pi.pam_authtok : "(not available)"));
-+    D(("Newauthtok: %s", *pi.pam_newauthtok!='\0' ? pi.pam_newauthtok : "(not available)"));
++    if (pi.pam_authtok != NULL) {
++        D(("Authtok: %s", *pi.pam_authtok!='\0' ? pi.pam_authtok : "(not available)"));
++    }
++    if (pi.pam_newauthtok != NULL) {
++        D(("Newauthtok: %s", *pi.pam_newauthtok!='\0' ? pi.pam_newauthtok : "(not available)"));
++    }
  }
  
  static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
-@@ -171,12 +173,15 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
+@@ -171,12 +177,15 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
      int pam_status;
      char *newpwd[2];
      int forward_pass = 0;
@@ -40,7 +44,7 @@ index d03407c..f2fdefe 100644
          } else {
              D(("unknown option: %s", *argv));
          }
-@@ -194,6 +199,16 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
+@@ -194,6 +203,16 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
          return ret;
      }
  
@@ -57,7 +61,7 @@ index d03407c..f2fdefe 100644
      pi.pam_authtok_type = SSS_AUTHTOK_TYPE_EMPTY;
      pi.pam_authtok = NULL;
      pi.pam_authtok_size = 0;
-@@ -297,6 +312,7 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
+@@ -297,6 +316,7 @@ static int pam_sss(int task, pam_handle_t *pamh, int flags, int argc,
          _pam_overwrite((void *)newpwd[1]);
          free(newpwd[1]);
      }


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sssd.spec	29 Apr 2009 22:02:13 -0000	1.16
+++ sssd.spec	29 Apr 2009 22:05:00 -0000	1.17
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -149,7 +149,7 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
-* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-2
+* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-3
 - Add use_first_pass option to fix pam stack problems
 
 * Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1