rpms/krb5/devel krb5-1.8-kpasswd_ccache.patch,1.2,1.3
Nalin Dahyabhai
nalin at fedoraproject.org
Fri Mar 19 21:15:10 UTC 2010
- Previous message: rpms/cppi/devel cppi.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/krb5/devel krb5.spec, 1.252, 1.253 sources, 1.31, 1.32 eklogin.xinetd, 1.2, NONE ekrb5-telnet.xinetd, 1.1, NONE ekshell.pamd, 1.3, NONE gssftp.pamd, 1.3, NONE gssftp.xinetd, 1.1, NONE klogin.xinetd, 1.2, NONE krb5-1.2.1-passive.patch, 1.2, NONE krb5-1.3-ftp-glob.patch, 1.2, NONE krb5-1.3-netkit-rsh.patch, 1.1, NONE krb5-1.4.1-telnet-environ.patch, 1.1, NONE krb5-1.6.3-ftp_fdleak.patch, 1.1, NONE krb5-1.6.3-ftp_glob_runique.patch, 1.1, NONE krb5-1.7-rcp-markus.patch, 1.1, NONE krb5-1.7-sizeof.patch, 1.2, NONE krb5-appl-1.0-io.patch, 1.1, NONE krb5-appl-1.0-largefile.patch, 1.1, NONE krb5-appl-1.0-manpaths.patch, 1.1, NONE krb5-appl-1.0-manpaths.txt, 1.1, NONE krb5-appl-1.0-pam.patch, 1.1, NONE krb5-appl-1.0-rlogind-environ.patch, 1.1, NONE krb5-telnet.xinetd, 1.1, NONE krb5-trunk-ftp_mget_case.patch, 1.2, NONE krb5.csh, 1.3, NONE krb5.sh, 1.3, NONE krlogin, 1.3, NONE krsh, 1.3, NONE kshell.pamd, 1.3, NONE kshell.xinetd, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nalin
Update of /cvs/extras/rpms/krb5/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28537
Modified Files:
krb5-1.8-kpasswd_ccache.patch
Log Message:
- replace our patch for #563431 (kpasswd doesn't fall back to guessing your
principal name using your user name if you don't have a ccache) with the
on upstream uses
krb5-1.8-kpasswd_ccache.patch:
kpasswd.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
Index: krb5-1.8-kpasswd_ccache.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.8-kpasswd_ccache.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- krb5-1.8-kpasswd_ccache.patch 12 Mar 2010 22:13:15 -0000 1.2
+++ krb5-1.8-kpasswd_ccache.patch 19 Mar 2010 21:15:10 -0000 1.3
@@ -1,34 +1,50 @@
If we encounter any errors reading the user's principal name from the default
ccache, fall back to the default of using the current user's name. RT#6683
-diff -up krb5-1.8/src/clients/kpasswd/kpasswd.c.kpasswd-ccache krb5-1.8/src/clients/kpasswd/kpasswd.c
---- krb5-1.8/src/clients/kpasswd/kpasswd.c.kpasswd-ccache 2009-10-30 20:48:38.000000000 -0400
-+++ krb5-1.8/src/clients/kpasswd/kpasswd.c 2010-03-05 11:04:42.000000000 -0500
-@@ -85,21 +85,23 @@ int main(int argc, char *argv[])
+Index: src/clients/kpasswd/kpasswd.c
+===================================================================
+--- src/clients/kpasswd/kpasswd.c (revision 23818)
++++ src/clients/kpasswd/kpasswd.c (revision 23819)
+@@ -47,7 +47,7 @@
+ {
+ krb5_error_code ret;
+ krb5_context context;
+- krb5_principal princ;
++ krb5_principal princ = NULL;
+ char *pname;
+ krb5_ccache ccache;
+ krb5_get_init_creds_opt *opts = NULL;
+@@ -84,23 +84,27 @@
+ com_err(argv[0], ret, "parsing client name");
exit(1);
}
- } else if ((ret = krb5_cc_default(context, &ccache)) != KRB5_CC_NOTFOUND) {
-+ princ = NULL;
-+
- if (ret) {
+- } else if ((ret = krb5_cc_default(context, &ccache)) != KRB5_CC_NOTFOUND) {
+- if (ret) {
++ } else {
++ ret = krb5_cc_default(context, &ccache);
++ if (ret != 0) {
com_err(argv[0], ret, "opening default ccache");
-- exit(1);
+ exit(1);
}
-+ else
- if ((ret = krb5_cc_get_principal(context, ccache, &princ))) {
+- if ((ret = krb5_cc_get_principal(context, ccache, &princ))) {
++ ret = krb5_cc_get_principal(context, ccache, &princ);
++ if (ret != 0 && ret != KRB5_CC_NOTFOUND && ret != KRB5_FCC_NOFILE) {
com_err(argv[0], ret, "getting principal from ccache");
-- exit(1);
+ exit(1);
}
-+ else
- if ((ret = krb5_cc_close(context, ccache))) {
+- if ((ret = krb5_cc_close(context, ccache))) {
++ ret = krb5_cc_close(context, ccache);
++ if (ret != 0) {
com_err(argv[0], ret, "closing ccache");
-- exit(1);
+ exit(1);
}
- } else {
-+ }
-+ if (princ == NULL) {
- get_name_from_passwd_file(argv[0], context, &princ);
+- get_name_from_passwd_file(argv[0], context, &princ);
++
++ if (princ == NULL)
++ get_name_from_passwd_file(argv[0], context, &princ);
}
+ if ((ret = krb5_get_init_creds_opt_alloc(context, &opts))) {
- Previous message: rpms/cppi/devel cppi.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/krb5/devel krb5.spec, 1.252, 1.253 sources, 1.31, 1.32 eklogin.xinetd, 1.2, NONE ekrb5-telnet.xinetd, 1.1, NONE ekshell.pamd, 1.3, NONE gssftp.pamd, 1.3, NONE gssftp.xinetd, 1.1, NONE klogin.xinetd, 1.2, NONE krb5-1.2.1-passive.patch, 1.2, NONE krb5-1.3-ftp-glob.patch, 1.2, NONE krb5-1.3-netkit-rsh.patch, 1.1, NONE krb5-1.4.1-telnet-environ.patch, 1.1, NONE krb5-1.6.3-ftp_fdleak.patch, 1.1, NONE krb5-1.6.3-ftp_glob_runique.patch, 1.1, NONE krb5-1.7-rcp-markus.patch, 1.1, NONE krb5-1.7-sizeof.patch, 1.2, NONE krb5-appl-1.0-io.patch, 1.1, NONE krb5-appl-1.0-largefile.patch, 1.1, NONE krb5-appl-1.0-manpaths.patch, 1.1, NONE krb5-appl-1.0-manpaths.txt, 1.1, NONE krb5-appl-1.0-pam.patch, 1.1, NONE krb5-appl-1.0-rlogind-environ.patch, 1.1, NONE krb5-telnet.xinetd, 1.1, NONE krb5-trunk-ftp_mget_case.patch, 1.2, NONE krb5.csh, 1.3, NONE krb5.sh, 1.3, NONE krlogin, 1.3, NONE krsh, 1.3, NONE kshell.pamd, 1.3, NONE kshell.xinetd, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list