Implementation clean-ups.
* Have Conn_Password return an empty string when no password has been set, to play better with pam.c. * Use strdup in Conn_SetPassword.
This commit is contained in:
parent
7df4c12da9
commit
c1d7f6216f
|
@ -922,19 +922,21 @@ GLOBAL const char*
|
||||||
Conn_Password( CONN_ID Idx )
|
Conn_Password( CONN_ID Idx )
|
||||||
{
|
{
|
||||||
assert( Idx > NONE );
|
assert( Idx > NONE );
|
||||||
return My_Connections[Idx].pwd;
|
if (My_Connections[Idx].pwd == NULL)
|
||||||
|
return (char*)"\0";
|
||||||
|
else
|
||||||
|
return My_Connections[Idx].pwd;
|
||||||
} /* Conn_Password */
|
} /* Conn_Password */
|
||||||
|
|
||||||
GLOBAL void
|
GLOBAL void
|
||||||
Conn_SetPassword( CONN_ID Idx, const char *Pwd )
|
Conn_SetPassword( CONN_ID Idx, const char *Pwd )
|
||||||
{
|
{
|
||||||
assert( Idx > NONE );
|
assert( Idx > NONE );
|
||||||
My_Connections[Idx].pwd = calloc(strlen(Pwd) + 1, sizeof(char));
|
My_Connections[Idx].pwd = strdup(Pwd);
|
||||||
if (My_Connections[Idx].pwd == NULL) {
|
if (My_Connections[Idx].pwd == NULL) {
|
||||||
Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
|
Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
strcpy( My_Connections[Idx].pwd, Pwd );
|
|
||||||
} /* Conn_SetPassword */
|
} /* Conn_SetPassword */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue