rpms/krb5
5
0
Fork 0
Code Issues Pull Requests Releases Activity

add newlines after new errors

Browse Source
This commit is contained in:
Nalin Dahyabhai 2006-10-18 21:36:40 +00:00
parent 74169f4b3c
commit 54faf41556
3 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kadmind.init
View File

@ -30,11 +30,11 @@ RETVAL=0
# Shell functions to cut down on useless shell instances. # Shell functions to cut down on useless shell instances.
start() { start() {
if [ ! -f /var/kerberos/krb5kdc/principal ] ; then if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
echo -n $"Error. Default principal database does not exist." echo $"Error. Default principal database does not exist."
exit 0 exit 0
fi fi
if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
echo -n $"Error. This appears to be a slave server, found kpropd.acl" echo $"Error. This appears to be a slave server, found kpropd.acl"
exit 0 exit 0
else else
if [ ! -f /var/kerberos/krb5kdc/kadm5.keytab ] ; then if [ ! -f /var/kerberos/krb5kdc/kadm5.keytab ] ; then

46
krb5-1.5-kt_default_name.patch Normal file
View File

@ -0,0 +1,46 @@
--- krb5-1.5/src/kadmin/cli/kadmin.c.kt_default_name 2006-10-18 14:13:18.000000000 -0400
+++ krb5-1.5/src/kadmin/cli/kadmin.c 2006-10-18 14:13:35.000000000 -0400
@@ -533,15 +533,6 @@
exit(1);
}
- /* register the WRFILE keytab type and set it as the default */
- {
-#define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab"
- /* XXX krb5_defkeyname is an internal library global and
- should go away */
- extern char *krb5_defkeyname;
- krb5_defkeyname = DEFAULT_KEYTAB;
- }
-
return query;
}
--- krb5-1.5/src/kadmin/cli/keytab.c.kt_default_name 2006-10-18 14:07:36.000000000 -0400
+++ krb5-1.5/src/kadmin/cli/keytab.c 2006-10-18 14:51:21.000000000 -0400
@@ -69,15 +69,20 @@
krb5_keytab *keytab)
{
int code;
+ char filename[FILENAME_MAX];
if (*keytab_str == NULL) {
- /* XXX krb5_defkeyname is an internal library global and
- should go away */
- if (! (*keytab_str = strdup(krb5_defkeyname))) {
- com_err(whoami, ENOMEM, "while creating keytab name");
+ code = krb5_kt_default_name(my_context, filename, sizeof(filename));
+ if (code != 0) {
+ com_err(whoami, code, "while determining default keytab name");
+ return 1;
+ }
+ *keytab_str = strdup(filename);
+ if (*keytab_str == NULL) {
+ com_err(whoami, ENOMEM, "while creating default keytab name");
return 1;
}
- code = krb5_kt_default(my_context, keytab);
+ code = krb5_kt_resolve(my_context, *keytab_str, keytab);
if (code != 0) {
com_err(whoami, code, "while opening default keytab");
free(*keytab_str);

18
krb5.spec
View File

@ -10,7 +10,7 @@
Summary: The Kerberos network authentication system. Summary: The Kerberos network authentication system.
Name: krb5 Name: krb5
Version: 1.5 Version: 1.5
Release: 9 Release: 9.99999
# Maybe we should explode from the now-available-to-everybody tarball instead? # Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -134,6 +134,7 @@ workstation.
%changelog %changelog
* Wed Oct 18 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-10 * Wed Oct 18 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-10
- rename krb5.sh and krb5.csh so that they don't overlap (#210623)
- way-late application of added error info in kadmind.init (#65853) - way-late application of added error info in kadmind.init (#65853)
* Mon Oct 9 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-9 * Mon Oct 9 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-9
@ -1060,7 +1061,12 @@ install -m 644 $RPM_SOURCE_DIR/kadm5.acl $RPM_BUILD_ROOT%{_var}/kerberos/krb5kdc
# Login-time scriptlets to fix the PATH variable. # Login-time scriptlets to fix the PATH variable.
mkdir -p $RPM_BUILD_ROOT/etc/profile.d mkdir -p $RPM_BUILD_ROOT/etc/profile.d
install -m 644 $RPM_SOURCE_DIR/krb5.conf $RPM_BUILD_ROOT/etc/krb5.conf install -m 644 $RPM_SOURCE_DIR/krb5.conf $RPM_BUILD_ROOT/etc/krb5.conf
install -m 755 $RPM_SOURCE_DIR/krb5.{sh,csh} $RPM_BUILD_ROOT/etc/profile.d/ for subpackage in devel workstation ; do
install -m 755 $RPM_SOURCE_DIR/krb5.sh \
$RPM_BUILD_ROOT/etc/profile.d/krb5-${subpackage}.sh
install -m 755 $RPM_SOURCE_DIR/krb5.csh \
$RPM_BUILD_ROOT/etc/profile.d/krb5-${subpackage}.csh
done
# Server init scripts. # Server init scripts.
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@ -1165,8 +1171,8 @@ fi
%files workstation %files workstation
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) /etc/profile.d/krb5.sh %config(noreplace) /etc/profile.d/krb5-workstation.sh
%config(noreplace) /etc/profile.d/krb5.csh %config(noreplace) /etc/profile.d/krb5-workstation.csh
%config(noreplace) /etc/xinetd.d/* %config(noreplace) /etc/xinetd.d/*
@ -1313,8 +1319,8 @@ fi
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) /etc/profile.d/krb5.sh %config(noreplace) /etc/profile.d/krb5-devel.sh
%config(noreplace) /etc/profile.d/krb5.csh %config(noreplace) /etc/profile.d/krb5-devel.csh
%docdir %{krb5prefix}/man %docdir %{krb5prefix}/man
%doc doc/api/*.pdf %doc doc/api/*.pdf