use esetenv

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9089 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-10-02 05:06:04 +00:00
parent 80b8795b5b
commit 3e00ddf50d
13 changed files with 30 additions and 47 deletions

View File

@@ -331,7 +331,7 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
"%s%u",
TKT_ROOT,
(unsigned)pw->pw_uid);
setenv("KRBTKFILE", ts, 1);
esetenv("KRBTKFILE", ts, 1);
if (pw->pw_uid == 0)
syslog(LOG_INFO|LOG_AUTH,

View File

@@ -277,7 +277,6 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
krb5_data outbuf;
krb5_keyblock *key_block;
char *name;
krb5_principal server;
int zero = 0;
if (cnt-- < 1)
@@ -312,29 +311,13 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
return;
}
ret = krb5_sock_to_principal (context,
0,
"host",
KRB5_NT_SRV_HST,
&server);
if (ret) {
Data(ap, KRB_REJECT, "krb5_sock_to_principal failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
printf("Kerberos V5: "
"krb5_sock_to_principal failed (%s)\r\n",
krb5_get_err_text(context, ret));
return;
}
ret = krb5_rd_req(context,
&auth_context,
&auth,
server,
NULL,
NULL,
NULL,
&ticket);
krb5_free_principal (context, server);
if (ret) {
char *errbuf;
@@ -477,7 +460,7 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
}
#if defined(DCE)
setenv("KRB5CCNAME", ccname, 1);
esetenv("KRB5CCNAME", ccname, 1);
#endif
ret = krb5_rd_cred (context,
auth_context,
@@ -772,9 +755,9 @@ kerberos5_dfspag(void)
{
if (dfsk5ok) {
dfspag = krb5_dfs_pag(context, dfsfwd, ticket->client,
UserNameRequested);
UserNameRequested);
}
}
#endif
#endif /* KRB5 */

View File

@@ -1016,7 +1016,7 @@ suboption(void)
return;
settimer(xdisplocsubopt);
subpointer[SB_LEN()] = '\0';
setenv("DISPLAY", (char *)subpointer, 1);
esetenv("DISPLAY", (char *)subpointer, 1);
break;
} /* end of case TELOPT_XDISPLOC */
@@ -1183,7 +1183,7 @@ suboption(void)
case ENV_USERVAR:
*cp = '\0';
if (valp)
setenv(varp, valp, 1);
esetenv(varp, valp, 1);
else
unsetenv(varp);
cp = varp = (char *)subpointer;
@@ -1202,7 +1202,7 @@ suboption(void)
}
*cp = '\0';
if (valp)
setenv(varp, valp, 1);
esetenv(varp, valp, 1);
else
unsetenv(varp);
break;

View File

@@ -738,7 +738,7 @@ Please contact your net administrator");
*/
*user_name = 0;
level = getterminaltype(user_name, sizeof(user_name));
setenv("TERM", terminaltype ? terminaltype : "network", 1);
esetenv("TERM", terminaltype ? terminaltype : "network", 1);
#ifdef _SC_CRAY_SECURE_SYS
if (secflag) {