diff --git a/pam_krb5-2.3.1-log-choise.dif b/pam_krb5-2.3.1-log-choise.dif index a504c1c..e2f45a1 100644 --- a/pam_krb5-2.3.1-log-choise.dif +++ b/pam_krb5-2.3.1-log-choise.dif @@ -1,8 +1,8 @@ -Index: pam_krb5-2.3.1-1/src/acct.c +Index: pam_krb5-2.3.7-1/src/acct.c =================================================================== ---- pam_krb5-2.3.1-1.orig/src/acct.c -+++ pam_krb5-2.3.1-1/src/acct.c -@@ -98,6 +98,10 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int +--- pam_krb5-2.3.7-1.orig/src/acct.c ++++ pam_krb5-2.3.7-1/src/acct.c +@@ -96,6 +96,10 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int krb5_free_context(ctx); return PAM_SERVICE_ERR; } @@ -12,12 +12,12 @@ Index: pam_krb5-2.3.1-1/src/acct.c + } /* Get information about the user and the user's principal name. */ - userinfo = _pam_krb5_user_info_init(ctx, user, options->realm, -Index: pam_krb5-2.3.1-1/src/auth.c + userinfo = _pam_krb5_user_info_init(ctx, user, options); +Index: pam_krb5-2.3.7-1/src/auth.c =================================================================== ---- pam_krb5-2.3.1-1.orig/src/auth.c -+++ pam_krb5-2.3.1-1/src/auth.c -@@ -116,9 +116,10 @@ pam_sm_authenticate(pam_handle_t *pamh, +--- pam_krb5-2.3.7-1.orig/src/auth.c ++++ pam_krb5-2.3.7-1/src/auth.c +@@ -114,9 +114,10 @@ pam_sm_authenticate(pam_handle_t *pamh, return PAM_SERVICE_ERR; } if (options->debug) { @@ -29,8 +29,8 @@ Index: pam_krb5-2.3.1-1/src/auth.c + _pam_krb5_set_init_opts(ctx, gic_options, options); - /* Get information about the user and the user's principal name. */ -@@ -476,6 +477,11 @@ int + /* Prompt for the password, as we might need to. */ +@@ -520,6 +521,11 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, PAM_KRB5_MAYBE_CONST char **argv) { @@ -42,11 +42,11 @@ Index: pam_krb5-2.3.1-1/src/auth.c if (flags & PAM_ESTABLISH_CRED) { return pam_sm_open_session(pamh, flags, argc, argv); } -Index: pam_krb5-2.3.1-1/src/password.c +Index: pam_krb5-2.3.7-1/src/password.c =================================================================== ---- pam_krb5-2.3.1-1.orig/src/password.c -+++ pam_krb5-2.3.1-1/src/password.c -@@ -118,6 +118,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int +--- pam_krb5-2.3.7-1.orig/src/password.c ++++ pam_krb5-2.3.7-1/src/password.c +@@ -116,6 +116,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int krb5_free_context(ctx); return PAM_SERVICE_ERR; } @@ -63,11 +63,11 @@ Index: pam_krb5-2.3.1-1/src/password.c _pam_krb5_set_init_opts(ctx, gic_options, options); /* Get information about the user and the user's principal name. */ -Index: pam_krb5-2.3.1-1/src/session.c +Index: pam_krb5-2.3.7-1/src/session.c =================================================================== ---- pam_krb5-2.3.1-1.orig/src/session.c -+++ pam_krb5-2.3.1-1/src/session.c -@@ -103,6 +103,10 @@ pam_sm_open_session(pam_handle_t *pamh, +--- pam_krb5-2.3.7-1.orig/src/session.c ++++ pam_krb5-2.3.7-1/src/session.c +@@ -101,6 +101,10 @@ pam_sm_open_session(pam_handle_t *pamh, krb5_free_context(ctx); return PAM_SERVICE_ERR; } @@ -77,8 +77,8 @@ Index: pam_krb5-2.3.1-1/src/session.c + } /* Get information about the user and the user's principal name. */ - userinfo = _pam_krb5_user_info_init(ctx, user, options->realm, -@@ -336,7 +340,10 @@ pam_sm_close_session(pam_handle_t *pamh, + userinfo = _pam_krb5_user_info_init(ctx, user, options); +@@ -331,7 +335,10 @@ pam_sm_close_session(pam_handle_t *pamh, krb5_free_context(ctx); return PAM_SERVICE_ERR; } @@ -88,5 +88,5 @@ Index: pam_krb5-2.3.1-1/src/session.c + options->realm); + } /* Get information about the user and the user's principal name. */ - userinfo = _pam_krb5_user_info_init(ctx, user, options->realm, - options->user_check, + userinfo = _pam_krb5_user_info_init(ctx, user, options); + if (userinfo == NULL) { diff --git a/pam_krb5.changes b/pam_krb5.changes index c0c8f3e..f8d0d15 100644 --- a/pam_krb5.changes +++ b/pam_krb5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:36 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Jul 27 11:53:30 CEST 2009 - mc@novell.com diff --git a/pam_krb5.spec b/pam_krb5.spec index ebf0be5..46559c6 100644 --- a/pam_krb5.spec +++ b/pam_krb5.spec @@ -21,7 +21,7 @@ Name: pam_krb5 BuildRequires: krb5-client krb5-devel krb5-server openssl-devel pam-devel %define PAM_RELEASE 1 -License: BSD 3-clause (or similar) ; LGPL v2.0 or later +License: BSD3c(or similar) ; LGPLv2.0+ Group: Productivity/Networking/Security Provides: pam_krb AutoReqProv: on @@ -31,7 +31,7 @@ Obsoletes: pam_krb5-64bit %endif # Version: 2.3.7 -Release: 1 +Release: 2 Summary: PAM Module for Kerberos Authentication Url: http://sourceforge.net/projects/pam-krb5/ Source: pam_krb5-%{version}-%{PAM_RELEASE}.tar.bz2