TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix unintended rename of krbtkfile

Browse Source
pull/2/head
Slávek Banko 13 years ago
parent a1aa8254a4
commit 2f56a3448b
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
doc/tdm/tdmrc-ref.docbook
Unescape Escape View File

@ -2265,7 +2265,7 @@ the following environment variables are passed:</para>
<listitem><para>may be set to a non-standard authority file</para></listitem> <listitem><para>may be set to a non-standard authority file</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>KRBTTDEFILE</term> <term>KRBTKFILE</term>
<listitem><para>may be set to a Kerberos4 credentials cache name</para> <listitem><para>may be set to a Kerberos4 credentials cache name</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

22
tdm/backend/client.c
Unescape Escape View File

@ -133,7 +133,7 @@ static char tty[16], hostname[100];
static struct spwd *sp; static struct spwd *sp;
# endif # endif
# ifdef KERBEROS # ifdef KERBEROS
static char krbttdefile[MAXPATHLEN]; static char krbtkfile[MAXPATHLEN];
# endif # endif
#endif #endif
@ -719,24 +719,24 @@ Verify( GConvFunc gconv, int rootok )
V_RET_FAIL( 0 ); V_RET_FAIL( 0 );
} }
sprintf( krbttdefile, "%s.%.*s", TKT_ROOT, MAXPATHLEN - strlen( TKT_ROOT ) - 2, td->name ); sprintf( krbtkfile, "%s.%.*s", TKT_ROOT, MAXPATHLEN - strlen( TKT_ROOT ) - 2, td->name );
krb_set_tkt_string( krbttdefile ); krb_set_tkt_string( krbtkfile );
unlink( krbttdefile ); unlink( krbtkfile );
ret = krb_verify_user( curuser, "", realm, curpass, 1, "rcmd" ); ret = krb_verify_user( curuser, "", realm, curpass, 1, "rcmd" );
if (ret == KSUCCESS) { if (ret == KSUCCESS) {
chown( krbttdefile, p->pw_uid, p->pw_gid ); chown( krbtkfile, p->pw_uid, p->pw_gid );
Debug( "KerberosIV verify succeeded\n" ); Debug( "KerberosIV verify succeeded\n" );
goto done; goto done;
} else if (ret != KDC_PR_UNKNOWN && ret != SKDC_CANT) { } else if (ret != KDC_PR_UNKNOWN && ret != SKDC_CANT) {
LogError( "KerberosIV verification failure %\"s for %s\n", LogError( "KerberosIV verification failure %\"s for %s\n",
krb_get_err_text( ret ), curuser ); krb_get_err_text( ret ), curuser );
krbttdefile[0] = '\0'; krbtkfile[0] = '\0';
V_RET_FAIL( 0 ); V_RET_FAIL( 0 );
} }
Debug( "KerberosIV verify failed: %s\n", krb_get_err_text( ret ) ); Debug( "KerberosIV verify failed: %s\n", krb_get_err_text( ret ) );
} }
krbttdefile[0] = '\0'; krbtkfile[0] = '\0';
# endif /* KERBEROS */ # endif /* KERBEROS */
# if defined(ultrix) || defined(__ultrix__) # if defined(ultrix) || defined(__ultrix__)
@ -1259,7 +1259,7 @@ StartClient()
} }
# else /* _AIX */ # else /* _AIX */
# if defined(KERBEROS) && !defined(NO_AFS) # if defined(KERBEROS) && !defined(NO_AFS)
if (krbttdefile[0] != '\0') { if (krbtkfile[0] != '\0') {
if (k_hasafs()) { if (k_hasafs()) {
if (k_setpag() == -1) if (k_setpag() == -1)
LogError( "setpag() for %s failed\n", curuser ); LogError( "setpag() for %s failed\n", curuser );
@ -1307,8 +1307,8 @@ StartClient()
if (cursource == PWSRC_AUTOLOGIN) if (cursource == PWSRC_AUTOLOGIN)
env = setEnv (env, "TDM_AUTOLOGIN", curuser); env = setEnv (env, "TDM_AUTOLOGIN", curuser);
#if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS) #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
if (krbttdefile[0] != '\0') if (krbtkfile[0] != '\0')
env = setEnv( env, "KRBTTDEFILE", krbttdefile ); env = setEnv( env, "KRBTKFILE", krbtkfile );
#endif #endif
#ifdef WITH_CONSOLE_KIT #ifdef WITH_CONSOLE_KIT
if (ck_session_cookie != NULL) { if (ck_session_cookie != NULL) {
@ -1752,7 +1752,7 @@ SessionExit( int status )
#endif /* K5AUTH */ #endif /* K5AUTH */
#if !defined(USE_PAM) && !defined(_AIX) #if !defined(USE_PAM) && !defined(_AIX)
# ifdef KERBEROS # ifdef KERBEROS
if (krbttdefile[0]) { if (krbtkfile[0]) {
(void)dest_tkt(); (void)dest_tkt();
# ifndef NO_AFS # ifndef NO_AFS
if (k_hasafs()) if (k_hasafs())

2
tdm/config.def
Unescape Escape View File

@ -632,7 +632,7 @@ the following environment variables are passed:</para>
<listitem><para>may be set to a non-standard authority file</para></listitem> <listitem><para>may be set to a non-standard authority file</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>KRBTTDEFILE</term> <term>KRBTKFILE</term>
<listitem><para>may be set to a Kerberos4 credentials cache name</para> <listitem><para>may be set to a Kerberos4 credentials cache name</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

Write Preview
Loading…
Cancel
Save